mercurial-source: mercurial/commands.py annotate

annotate mercurial/commands.py @ 11442:ee1ed6afac21 stable

addchangegroup: pass in lock to release it before changegroup hook is called Currently, callers of addchangegroup first acquire the repository lock, usually to check that an unbundle request isn't racing. This means that changegroup hook actions that might write to a repo get stuck waiting for a lock. Here, we add a new optional lock parameter and update all the callers. Post-1.6 we may make it non-optional.

author	Matt Mackall <mpm@selenic.com>
date	Fri, 25 Jun 2010 13:47:28 -0500
parents	c04084753990
children	eac141407b85

rev	line source
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1 # commands.py - command processing for mercurial
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	2 #
4635 63b9d2deed48 Updated copyright notices and add "and others" to "hg version" Thomas Arendsen Hein <thomas@intevation.de> parents: 4615 diff changeset	3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	4 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8210 diff changeset	5 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10224 diff changeset	6 # GNU General Public License version 2 or any later version.
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	7
6211 f89fd07fc51d Expand import * to allow Pyflakes to find problems Joel Rosdahl <joel@rosdahl.net> parents: 6210 diff changeset	8 from node import hex, nullid, nullrev, short
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	9 from lock import release
7013 f56e788fa292 i18n: mark help strings for translation Martin Geisler <mg@daimi.au.dk> parents: 7012 diff changeset	10 from i18n import _, gettext
9678 e2b1de5fee04 remove unused imports Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9675 diff changeset	11 import os, re, sys, difflib, time, tempfile
e2b1de5fee04 remove unused imports Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9675 diff changeset	12 import hg, util, revlog, bundlerepo, extensions, copies, error
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	13 import patch, help, mdiff, url, encoding, templatekw, discovery
11004 7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	14 import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10650 diff changeset	15 import merge as mergemod
11276 f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	16 import minirst, revset
11336 3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	17 import dagparser
2738 ad4155e757da Kill ui.setconfig_remoteopts Matt Mackall <mpm@selenic.com> parents: 2718 diff changeset	18
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	19 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	20
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	21 def add(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	22 """add the specified files on the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	23
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	24 Schedule files to be version controlled and added to the
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	25 repository.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	26
3831 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3828 diff changeset	27 The files will be added to the repository at the next commit. To
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	28 undo an add before that, see :hg:`forget`.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	29
7805 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	30 If no names are given, add all files to the repository.
10446 a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	31
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	32 .. container:: verbose
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	33
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	34 An example showing how new (unknown) files are added
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	35 automatically by :hg:`add`::
10446 a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	36
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	37 $ ls
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	38 foo.c
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	39 $ hg status
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	40 ? foo.c
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	41 $ hg add
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	42 adding foo.c
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	43 $ hg status
10448 6e5a47398fc5 commands: correct example in add help text Martin Geisler <mg@lazybytes.net> parents: 10446 diff changeset	44 A foo.c
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	45 """
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	46
8680 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	47 bad = []
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	48 names = []
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	49 m = cmdutil.match(repo, pats, opts)
8680 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	50 oldbad = m.bad
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	51 m.bad = lambda x, y: bad.append(x) or oldbad(x, y)
8680 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	52
32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	53 for f in repo.walk(m):
32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	54 exact = m.exact(f)
32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	55 if exact or f not in repo.dirstate:
32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	56 names.append(f)
32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	57 if ui.verbose or not exact:
32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	58 ui.status(_('adding %s\n') % m.rel(f))
2503 37655f10ced6 Don't require opts['dry_run'] to be set to fix external tools like tailor. Thomas Arendsen Hein <thomas@intevation.de> parents: 2494 diff changeset	59 if not opts.get('dry_run'):
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	60 bad += [f for f in repo[None].add(names) if f in m.files()]
8680 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	61 return bad and 1 or 0
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	62
766 b444a7e053f1 Get addremove to use new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 764 diff changeset	63 def addremove(ui, repo, pats, *opts):
3174 3637d5d17cbc Documentation fixes for addremove. Thomas Arendsen Hein <thomas@intevation.de> parents: 3165 diff changeset	64 """add all new files, delete all missing files
2181 690da72b0b16 deprecate addremove command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2179 diff changeset	65
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	66 Add all new files and remove all missing files from the
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	67 repository.
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	68
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	69 New files are ignored if they match any of the patterns in
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	70 .hgignore. As with add, these changes take effect at the next
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	71 commit.
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2956 diff changeset	72
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	73 Use the -s/--similarity option to detect renamed files. With a
9237 16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	74 parameter greater than 0, this compares every removed file with
16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	75 every added file and records those similar enough as renames. This
16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	76 option takes a percentage between 0 (disabled) and 100 (files must
16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	77 be identical) as its parameter. Detecting renamed files this way
16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	78 can be expensive.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	79
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	80 Returns 0 if all files are successfully added.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	81 """
4966 8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4932 diff changeset	82 try:
8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4932 diff changeset	83 sim = float(opts.get('similarity') or 0)
8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4932 diff changeset	84 except ValueError:
8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4932 diff changeset	85 raise util.Abort(_('similarity must be a number'))
2958 ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2956 diff changeset	86 if sim < 0 or sim > 100:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2956 diff changeset	87 raise util.Abort(_('similarity must be between 0 and 100'))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	88 return cmdutil.addremove(repo, pats, opts, similarity=sim / 100.0)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	89
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	90 def annotate(ui, repo, pats, *opts):
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	91 """show changeset information by line for each file
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	92
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	93 List changes in files, showing the revision id responsible for
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	94 each line
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	95
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	96 This command is useful for discovering when a change was made and
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	97 by whom.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	98
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	99 Without the -a/--text option, annotate will avoid processing files
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	100 it detects as binary. With -a, annotate will annotate the file
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	101 anyway, although the results will probably be neither useful
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	102 nor desirable.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	103
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	104 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	105 """
10579 f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	106 if opts.get('follow'):
f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	107 # --follow is deprecated and now just an alias for -f/--file
f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	108 # to mimic the behavior of Mercurial before version 1.5
f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	109 opts['file'] = 1
f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	110
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	111 datefunc = ui.quiet and util.shortdate or util.datestr
7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	112 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	113
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	114 if not pats:
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	115 raise util.Abort(_('at least one filename or pattern is required'))
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	116
4847 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	117 opmap = [('user', lambda x: ui.shortuser(x[0].user())),
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	118 ('number', lambda x: str(x[0].rev())),
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	119 ('changeset', lambda x: short(x[0].node())),
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	120 ('date', getdate),
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	121 ('file', lambda x: x[0].path()),
4847 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	122 ]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	123
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	124 if (not opts.get('user') and not opts.get('changeset')
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	125 and not opts.get('date') and not opts.get('file')):
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	126 opts['number'] = 1
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	127
4847 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	128 linenumber = opts.get('line_number') is not None
10394 4612cded5176 fix coding style (reported by pylint) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10390 diff changeset	129 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
4847 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	130 raise util.Abort(_('at least one of -n/-c is required for -l'))
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	131
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	132 funcmap = [func for op, func in opmap if opts.get(op)]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	133 if linenumber:
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	134 lastfunc = funcmap[-1]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	135 funcmap[-1] = lambda x: "%s:%s" % (lastfunc(x), x[1])
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	136
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	137 ctx = repo[opts.get('rev')]
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	138 m = cmdutil.match(repo, pats, opts)
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	139 follow = not opts.get('no_follow')
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	140 for abs in ctx.walk(m):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	141 fctx = ctx[abs]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	142 if not opts.get('text') and util.binary(fctx.data()):
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	143 ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	144 continue
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	145
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	146 lines = fctx.annotate(follow=follow, linenumber=linenumber)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	147 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	148
4847 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	149 for f in funcmap:
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	150 l = [f(n) for n, dummy in lines]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	151 if l:
7094 a4769dec7773 annotate: fix bug when annotating multiple files Matt Mackall <mpm@selenic.com> parents: 7040 diff changeset	152 ml = max(map(len, l))
a4769dec7773 annotate: fix bug when annotating multiple files Matt Mackall <mpm@selenic.com> parents: 7040 diff changeset	153 pieces.append(["%*s" % (ml, x) for x in l])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	154
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	155 if pieces:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	156 for p, l in zip(zip(*pieces), lines):
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	157 ui.write("%s: %s" % (" ".join(p), l[1]))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	158
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	159 def archive(ui, repo, dest, **opts):
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	160 '''create an unversioned archive of a repository revision
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	161
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	162 By default, the revision used is the parent of the working
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	163 directory; use -r/--rev to specify a different revision.
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	164
10650 9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	165 The archive type is automatically detected based on file
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	166 extension (or override using -t/--type).
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	167
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	168 Valid types are:
9892 4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	169
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	170 :``files``: a directory full of files (default)
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	171 :``tar``: tar archive, uncompressed
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	172 :``tbz2``: tar archive, compressed using bzip2
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	173 :``tgz``: tar archive, compressed using gzip
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	174 :``uzip``: zip archive, uncompressed
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	175 :``zip``: zip archive, compressed using deflate
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	176
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	177 The exact name of the destination archive or directory is given
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	178 using a format string; see :hg:`help export` for details.
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	179
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	180 Each member added to an archive file has a directory prefix
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	181 prepended. Use -p/--prefix to specify a format string for the
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	182 prefix. The default is the basename of the archive, with suffixes
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	183 removed.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	184
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	185 Returns 0 on success.
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	186 '''
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	187
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	188 ctx = repo[opts.get('rev')]
5061 a49f2a4d5ff7 archive: abort on empty repository. Fixes #624. Brendan Cully <brendan@kublai.com> parents: 4966 diff changeset	189 if not ctx:
7535 eadcc075967e archive: fix bogus error message with no working directory Matt Mackall <mpm@selenic.com> parents: 7534 diff changeset	190 raise util.Abort(_('no working directory: please specify a revision'))
5061 a49f2a4d5ff7 archive: abort on empty repository. Fixes #624. Brendan Cully <brendan@kublai.com> parents: 4966 diff changeset	191 node = ctx.node()
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2870 diff changeset	192 dest = cmdutil.make_filename(repo, dest, node)
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	193 if os.path.realpath(dest) == repo.root:
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	194 raise util.Abort(_('repository root cannot be destination'))
10650 9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	195
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	196 def guess_type():
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	197 exttypes = {
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	198 'tar': ['.tar'],
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	199 'tbz2': ['.tbz2', '.tar.bz2'],
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	200 'tgz': ['.tgz', '.tar.gz'],
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	201 'zip': ['.zip'],
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	202 }
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	203
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	204 for type, extensions in exttypes.items():
10654 153dd9139b0e any is not available for python2.4 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10651 diff changeset	205 if util.any(dest.endswith(ext) for ext in extensions):
10650 9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	206 return type
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	207 return None
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	208
9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	209 kind = opts.get('type') or guess_type() or 'files'
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	210 prefix = opts.get('prefix')
10650 9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	211
2476 0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	212 if dest == '-':
0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	213 if kind == 'files':
0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	214 raise util.Abort(_('cannot archive plain files to stdout'))
0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	215 dest = sys.stdout
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	216 if not prefix:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	217 prefix = os.path.basename(repo.root) + '-%h'
10650 9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	218
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2870 diff changeset	219 prefix = cmdutil.make_filename(repo, prefix, node)
10650 9ea7238ad935 archive: autodetect archive type by extension (issue2058) David Wolever <david@wolever.net> parents: 10649 diff changeset	220 matchfn = cmdutil.match(repo, [], opts)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	221 archival.archive(repo, dest, node, kind, not opts.get('no_decode'),
2476 0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	222 matchfn, prefix)
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	223
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	224 def backout(ui, repo, node=None, rev=None, **opts):
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	225 '''reverse effect of earlier changeset
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	226
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	227 Commit the backed out changes as a new changeset. The new
2254 827fcfe88b14 backout command: better help. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2245 diff changeset	228 changeset is a child of the backed out changeset.
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	229
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	230 If you backout a changeset other than the tip, a new head is
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	231 created. This head will be the new tip and you should merge this
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	232 backout changeset with another head.
2254 827fcfe88b14 backout command: better help. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2245 diff changeset	233
827fcfe88b14 backout command: better help. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2245 diff changeset	234 The --merge option remembers the parent of the working directory
827fcfe88b14 backout command: better help. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2245 diff changeset	235 before starting the backout, then merges the new head with that
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	236 changeset afterwards. This saves you from doing the merge by hand.
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	237 The result of this merge is not committed, as with a normal merge.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	238
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	239 See :hg:`help dates` for a list of formats valid for -d/--date.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	240
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	241 Returns 0 on success.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	242 '''
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	243 if rev and node:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	244 raise util.Abort(_("please specify just one revision"))
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	245
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	246 if not rev:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	247 rev = node
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	248
4726 f6e961c0155b Fix and test 'hg backout' without or with too many revisions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4718 diff changeset	249 if not rev:
f6e961c0155b Fix and test 'hg backout' without or with too many revisions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4718 diff changeset	250 raise util.Abort(_("please specify a revision to backout"))
f6e961c0155b Fix and test 'hg backout' without or with too many revisions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4718 diff changeset	251
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	252 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	253 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	254 opts['date'] = util.parsedate(date)
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	255
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	256 cmdutil.bail_if_changed(repo)
5720 be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5683 diff changeset	257 node = repo.lookup(rev)
be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5683 diff changeset	258
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	259 op1, op2 = repo.dirstate.parents()
5608 de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5547 diff changeset	260 a = repo.changelog.ancestor(op1, node)
de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5547 diff changeset	261 if a != node:
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	262 raise util.Abort(_('cannot backout change on a different branch'))
5608 de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5547 diff changeset	263
2614 8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	264 p1, p2 = repo.changelog.parents(node)
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	265 if p1 == nullid:
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	266 raise util.Abort(_('cannot backout a change with no parents'))
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	267 if p2 != nullid:
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	268 if not opts.get('parent'):
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	269 raise util.Abort(_('cannot backout a merge changeset without '
2614 8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	270 '--parent'))
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	271 p = repo.lookup(opts['parent'])
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	272 if p not in (p1, p2):
3679 2956948b81f3 fix warnings generated by pygettext.py. Marcos Chaves <marcos.nospam@gmail.com> parents: 3673 diff changeset	273 raise util.Abort(_('%s is not a parent of %s') %
3680 69cf255a55a1 Indentation cleanups for 2956948b81f3. Thomas Arendsen Hein <thomas@intevation.de> parents: 3679 diff changeset	274 (short(p), short(node)))
2614 8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	275 parent = p
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	276 else:
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	277 if opts.get('parent'):
2614 8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	278 raise util.Abort(_('cannot use --parent on non-merge changeset'))
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	279 parent = p1
5608 de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5547 diff changeset	280
6423 fb374b1b3911 backout: reverse changeset belongs on current branch Matt Mackall <mpm@selenic.com> parents: 6385 diff changeset	281 # the backout should appear on the same branch
fb374b1b3911 backout: reverse changeset belongs on current branch Matt Mackall <mpm@selenic.com> parents: 6385 diff changeset	282 branch = repo.dirstate.branch()
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2820 diff changeset	283 hg.clean(repo, node, show_stats=False)
6423 fb374b1b3911 backout: reverse changeset belongs on current branch Matt Mackall <mpm@selenic.com> parents: 6385 diff changeset	284 repo.dirstate.setbranch(branch)
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	285 revert_opts = opts.copy()
3818 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	286 revert_opts['date'] = None
2965 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	287 revert_opts['all'] = True
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	288 revert_opts['rev'] = hex(parent)
6044 7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	289 revert_opts['no_backup'] = None
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	290 revert(ui, repo, **revert_opts)
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	291 commit_opts = opts.copy()
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	292 commit_opts['addremove'] = False
2159 5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	293 if not commit_opts['message'] and not commit_opts['logfile']:
9186 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9136 diff changeset	294 # we don't translate commit messages
9188 a05aa192a00a commands: remove ineffective parenthesis Martin Geisler <mg@lazybytes.net> parents: 9187 diff changeset	295 commit_opts['message'] = "Backed out changeset %s" % short(node)
2268 6c9305fbebaf fix coding style of backout editor change. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2267 diff changeset	296 commit_opts['force_editor'] = True
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	297 commit(ui, repo, **commit_opts)
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	298 def nice(node):
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	299 return '%d:%s' % (repo.changelog.rev(node), short(node))
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	300 ui.status(_('changeset %s backs out changeset %s\n') %
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	301 (nice(repo.changelog.tip()), nice(node)))
2493 9c660e691e90 print message after backout that tells that backout adds new head. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2482 diff changeset	302 if op1 != node:
6161 bc1ba9124799 Reverse the way backout is doing the merge Gilles Moris <gilles.moris@free.fr> parents: 6146 diff changeset	303 hg.clean(repo, op1, show_stats=False)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	304 if opts.get('merge'):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	305 ui.status(_('merging with changeset %s\n')
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	306 % nice(repo.changelog.tip()))
6161 bc1ba9124799 Reverse the way backout is doing the merge Gilles Moris <gilles.moris@free.fr> parents: 6146 diff changeset	307 hg.merge(repo, hex(repo.changelog.tip()))
2493 9c660e691e90 print message after backout that tells that backout adds new head. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2482 diff changeset	308 else:
9c660e691e90 print message after backout that tells that backout adds new head. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2482 diff changeset	309 ui.status(_('the backout changeset is a new head - '
9c660e691e90 print message after backout that tells that backout adds new head. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2482 diff changeset	310 'do not forget to merge\n'))
2761 0aa458261901 fix hg backup option recommendation for auto-merge Christian Ebert <blacktrash@gmx.net> parents: 2760 diff changeset	311 ui.status(_('(use "backout --merge" '
0aa458261901 fix hg backup option recommendation for auto-merge Christian Ebert <blacktrash@gmx.net> parents: 2760 diff changeset	312 'if you want to auto-merge)\n'))
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	313
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	314 def bisect(ui, repo, rev=None, extra=None, command=None,
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	315 reset=None, good=None, bad=None, skip=None, noupdate=None):
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	316 """subdivision search of changesets
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	317
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	318 This command helps to find changesets which introduce problems. To
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	319 use, mark the earliest changeset you know exhibits the problem as
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	320 bad, then mark the latest changeset which is free from the problem
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	321 as good. Bisect will update your working directory to a revision
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	322 for testing (unless the -U/--noupdate option is specified). Once
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	323 you have performed tests, mark the working directory as good or
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	324 bad, and bisect will either update to another candidate changeset
6928 1a4c66d741a2 bisect: expand help text to explain REV argument and --noupdate Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6858 diff changeset	325 or announce that it has found the bad revision.
7184 380fda3eed13 clean up trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7038 diff changeset	326
6928 1a4c66d741a2 bisect: expand help text to explain REV argument and --noupdate Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6858 diff changeset	327 As a shortcut, you can also use the revision argument to mark a
1a4c66d741a2 bisect: expand help text to explain REV argument and --noupdate Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6858 diff changeset	328 revision as good or bad without checking it out first.
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	329
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	330 If you supply a command, it will be used for automatic bisection.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	331 Its exit status will be used to mark revisions as good or bad:
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	332 status 0 means good, 125 means to skip the revision, 127
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	333 (command not found) will abort the bisection, and any other
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	334 non-zero exit status means the revision is bad.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	335
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	336 Returns 0 on success.
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	337 """
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	338 def print_result(nodes, good):
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	339 displayer = cmdutil.show_changeset(ui, repo, {})
6858 8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	340 if len(nodes) == 1:
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	341 # narrowed it down to a single revision
8087 bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	342 if good:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	343 ui.write(_("The first good revision is:\n"))
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	344 else:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	345 ui.write(_("The first bad revision is:\n"))
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7364 diff changeset	346 displayer.show(repo[nodes[0]])
6858 8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	347 else:
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	348 # multiple possible revisions
8087 bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	349 if good:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	350 ui.write(_("Due to skipped revisions, the first "
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	351 "good revision could be any of:\n"))
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	352 else:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	353 ui.write(_("Due to skipped revisions, the first "
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	354 "bad revision could be any of:\n"))
6858 8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	355 for n in nodes:
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7364 diff changeset	356 displayer.show(repo[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	357 displayer.close()
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	358
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	359 def check_state(state, interactive=True):
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	360 if not state['good'] or not state['bad']:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	361 if (good or bad or skip or reset) and interactive:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	362 return
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	363 if not state['good']:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	364 raise util.Abort(_('cannot bisect (no known good revisions)'))
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	365 else:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	366 raise util.Abort(_('cannot bisect (no known bad revisions)'))
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	367 return True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	368
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	369 # backward compatibility
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	370 if rev in "good bad reset init".split():
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	371 ui.warn(_("(use of 'hg bisect <cmd>' is deprecated)\n"))
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	372 cmd, rev, extra = rev, extra, None
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	373 if cmd == "good":
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	374 good = True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	375 elif cmd == "bad":
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	376 bad = True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	377 else:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	378 reset = True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	379 elif extra or good + bad + skip + reset + bool(command) > 1:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	380 raise util.Abort(_('incompatible arguments'))
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	381
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	382 if reset:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	383 p = repo.join("bisect.state")
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	384 if os.path.exists(p):
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	385 os.unlink(p)
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	386 return
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	387
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	388 state = hbisect.load_state(repo)
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	389
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	390 if command:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	391 changesets = 1
7586 e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	392 try:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	393 while changesets:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	394 # update state
9590 17da88da1abd bisect: use util.system and fix good/bad when using -c Matt Mackall <mpm@selenic.com> parents: 9573 diff changeset	395 status = util.system(command)
7586 e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	396 if status == 125:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	397 transition = "skip"
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	398 elif status == 0:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	399 transition = "good"
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	400 # status < 0 means process was killed
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	401 elif status == 127:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	402 raise util.Abort(_("failed to execute %s") % command)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	403 elif status < 0:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	404 raise util.Abort(_("%s killed") % command)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	405 else:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	406 transition = "bad"
8798 2726a6df11e9 bisect: improve --command output Patrick Mezard <pmezard@gmail.com> parents: 8795 diff changeset	407 ctx = repo[rev or '.']
2726a6df11e9 bisect: improve --command output Patrick Mezard <pmezard@gmail.com> parents: 8795 diff changeset	408 state[transition].append(ctx.node())
2726a6df11e9 bisect: improve --command output Patrick Mezard <pmezard@gmail.com> parents: 8795 diff changeset	409 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
7586 e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	410 check_state(state, interactive=False)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	411 # bisect
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	412 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	413 # update to next check
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	414 cmdutil.bail_if_changed(repo)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	415 hg.clean(repo, nodes[0], show_stats=False)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	416 finally:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7560 diff changeset	417 hbisect.save_state(repo, state)
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	418 print_result(nodes, good)
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	419 return
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	420
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	421 # update state
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	422 node = repo.lookup(rev or '.')
9689 57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	423 if good or bad or skip:
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	424 if good:
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	425 state['good'].append(node)
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	426 elif bad:
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	427 state['bad'].append(node)
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	428 elif skip:
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	429 state['skip'].append(node)
57cee011ffcb bisect: no need to save the state if it wasn't changed Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9687 diff changeset	430 hbisect.save_state(repo, state)
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	431
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	432 if not check_state(state):
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	433 return
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	434
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	435 # actually bisect
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	436 nodes, changesets, good = hbisect.bisect(repo.changelog, state)
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	437 if changesets == 0:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	438 print_result(nodes, good)
6858 8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	439 else:
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	440 assert len(nodes) == 1 # only a single node can be tested next
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	441 node = nodes[0]
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	442 # compute the approximate number of remaining tests
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	443 tests, size = 0, 2
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	444 while size <= changesets:
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	445 tests, size = tests + 1, size * 2
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	446 rev = repo.changelog.rev(node)
9012 ada93c6bf554 bisect: fix format specifiers for integers Cédric Duval <cedricduval@free.fr> parents: 8995 diff changeset	447 ui.write(_("Testing changeset %d:%s "
ada93c6bf554 bisect: fix format specifiers for integers Cédric Duval <cedricduval@free.fr> parents: 8995 diff changeset	448 "(%d changesets remaining, ~%d tests)\n")
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	449 % (rev, short(node), changesets, tests))
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	450 if not noupdate:
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	451 cmdutil.bail_if_changed(repo)
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	452 return hg.clean(repo, node)
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	453
4197 b2873c587b1a branch: require --force to shadow existing branches Brendan Cully <brendan@kublai.com> parents: 4195 diff changeset	454 def branch(ui, repo, label=None, **opts):
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	455 """set or show the current branch name
8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	456
4601 e69da61e467e Notify the user that hg branch does not create a branch until commit Brendan Cully <brendan@kublai.com> parents: 4593 diff changeset	457 With no argument, show the current branch name. With one argument,
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	458 set the working directory branch name (the branch will not exist
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	459 in the repository until the next commit). Standard practice
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	460 recommends that primary development take place on the 'default'
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	461 branch.
4197 b2873c587b1a branch: require --force to shadow existing branches Brendan Cully <brendan@kublai.com> parents: 4195 diff changeset	462
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	463 Unless -f/--force is specified, branch will not let you set a
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	464 branch name that already exists, even if it's inactive.
5987 d1fe1a4eb2b7 Mention 'hg update' to switch branches in help for branch and branches. Thomas Arendsen Hein <thomas@intevation.de> parents: 5986 diff changeset	465
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	466 Use -C/--clean to reset the working directory branch to that of
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	467 the parent of the working directory, negating a previous branch
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	468 change.
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	469
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	470 Use the command :hg:`update` to switch to an existing branch. Use
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	471 :hg:`commit --close-branch` to mark this branch as closed.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	472
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	473 Returns 0 on success.
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	474 """
8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	475
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	476 if opts.get('clean'):
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	477 label = repo[None].parents()[0].branch()
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	478 repo.dirstate.setbranch(label)
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	479 ui.status(_('reset working directory to branch %s\n') % label)
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	480 elif label:
10315 be324d31b6c5 commands: label from user is in local encoding Steve Borho <steve@borho.org> parents: 10269 diff changeset	481 utflabel = encoding.fromlocal(label)
be324d31b6c5 commands: label from user is in local encoding Steve Borho <steve@borho.org> parents: 10269 diff changeset	482 if not opts.get('force') and utflabel in repo.branchtags():
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	483 if label not in [p.branch() for p in repo.parents()]:
4197 b2873c587b1a branch: require --force to shadow existing branches Brendan Cully <brendan@kublai.com> parents: 4195 diff changeset	484 raise util.Abort(_('a branch of the same name already exists'
10606 7648f32713f2 branch: help misuse of hg branch to switch branches Yuya Nishihara <yuya@tcha.org> parents: 10579 diff changeset	485 " (use 'hg update' to switch to it)"))
10315 be324d31b6c5 commands: label from user is in local encoding Steve Borho <steve@borho.org> parents: 10269 diff changeset	486 repo.dirstate.setbranch(utflabel)
4601 e69da61e467e Notify the user that hg branch does not create a branch until commit Brendan Cully <brendan@kublai.com> parents: 4593 diff changeset	487 ui.status(_('marked working directory as branch %s\n') % label)
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	488 else:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	489 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	490
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	491 def branches(ui, repo, active=False, closed=False):
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	492 """list repository named branches
8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	493
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: 4667 diff changeset	494 List the repository's named branches, indicating which ones are
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	495 inactive. If -c/--closed is specified, also list branches which have
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	496 been marked closed (see :hg:`commit --close-branch`).
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	497
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	498 If -a/--active is specified, only show active branches. A branch
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	499 is considered active if it contains repository heads.
5987 d1fe1a4eb2b7 Mention 'hg update' to switch branches in help for branch and branches. Thomas Arendsen Hein <thomas@intevation.de> parents: 5986 diff changeset	500
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	501 Use the command :hg:`update` to switch to an existing branch.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	502
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	503 Returns 0.
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	504 """
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	505
6636 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	506 hexfunc = ui.debugflag and hex or short
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9666 diff changeset	507 activebranches = [repo[n].branch() for n in repo.heads()]
8800 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	508 def testactive(tag, node):
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	509 realhead = tag in activebranches
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	510 open = node in repo.branchheads(tag, closed=False)
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	511 return realhead and open
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	512 branches = sorted([(testactive(tag, node), repo.changelog.rev(node), tag)
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	513 for tag, node in repo.branchtags().items()],
344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	514 reverse=True)
6636 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	515
a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	516 for isactive, node, tag in branches:
a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	517 if (not active) or isactive:
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9666 diff changeset	518 encodedtag = encoding.tolocal(tag)
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: 4667 diff changeset	519 if ui.quiet:
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9666 diff changeset	520 ui.write("%s\n" % encodedtag)
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: 4667 diff changeset	521 else:
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	522 hn = repo.lookup(node)
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	523 if isactive:
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	524 notice = ''
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	525 elif hn not in repo.branchheads(tag, closed=False):
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	526 if not closed:
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	527 continue
9951 9b626a63f556 commands: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 9894 diff changeset	528 notice = _(' (closed)')
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	529 else:
9951 9b626a63f556 commands: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 9894 diff changeset	530 notice = _(' (inactive)')
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9666 diff changeset	531 rev = str(node).rjust(31 - encoding.colwidth(encodedtag))
ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9666 diff changeset	532 data = encodedtag, rev, hexfunc(hn), notice
6814 88804fad71bc branches unparseable output fix (issue1230) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6685 diff changeset	533 ui.write("%s %s:%s%s\n" % data)
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3467 diff changeset	534
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2493 diff changeset	535 def bundle(ui, repo, fname, dest=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	536 """create a changegroup file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	537
3508 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3507 diff changeset	538 Generate a compressed changegroup file collecting changesets not
7805 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	539 known to be in another repository.
3508 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3507 diff changeset	540
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	541 If you omit the destination repository, then hg assumes the
a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	542 destination will have all the nodes you specify with --base
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	543 parameters. To create a bundle containing all changesets, use
8903 d403cf4eb32d help: describe bundle compression methods (issue1523) Henrik Stuart <hg@hstuart.dk> parents: 8902 diff changeset	544 -a/--all (or --base null).
d403cf4eb32d help: describe bundle compression methods (issue1523) Henrik Stuart <hg@hstuart.dk> parents: 8902 diff changeset	545
8958 8358cf63f612 commands: improve bundle compression methods description Stefano Mioli <jstevie@gmail.com> parents: 8955 diff changeset	546 You can change compression method with the -t/--type option.
8358cf63f612 commands: improve bundle compression methods description Stefano Mioli <jstevie@gmail.com> parents: 8955 diff changeset	547 The available compression methods are: none, bzip2, and
8903 d403cf4eb32d help: describe bundle compression methods (issue1523) Henrik Stuart <hg@hstuart.dk> parents: 8902 diff changeset	548 gzip (by default, bundles are compressed using bzip2).
3508 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3507 diff changeset	549
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	550 The bundle file can then be transferred using conventional means
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	551 and applied to another repository with the unbundle or pull
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	552 command. This is useful when direct push and pull are not
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	553 available or when exporting an entire repository is undesirable.
3508 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3507 diff changeset	554
aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3507 diff changeset	555 Applying bundles preserves all changeset contents including
aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3507 diff changeset	556 permissions, copy/rename information, and revision history.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	557
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	558 Returns 0 on success, 1 if no changes found.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	559 """
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	560 revs = opts.get('rev') or None
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	561 if revs:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	562 revs = [repo.lookup(rev) for rev in revs]
6171 73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	563 if opts.get('all'):
73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	564 base = ['null']
73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	565 else:
73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	566 base = opts.get('base')
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	567 if base:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	568 if dest:
8669 6f0f69da003e commands: typo in bundle abort message Martin Geisler <mg@lazybytes.net> parents: 8664 diff changeset	569 raise util.Abort(_("--base is incompatible with specifying "
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	570 "a destination"))
3293 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	571 base = [repo.lookup(rev) for rev in base]
a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	572 # create the right base
a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	573 # XXX: nodesbetween / changegroup* should be "fixed" instead
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	574 o = []
8462 7af92e70bb25 revlog: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8408 diff changeset	575 has = set((nullid,))
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	576 for n in base:
3634 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3632 diff changeset	577 has.update(repo.changelog.reachable(n))
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	578 if revs:
3293 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	579 visit = list(revs)
10479 bb508b312359 bundle: exclude csets given in --base, unless they are in --rev (issue1910) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10448 diff changeset	580 has.difference_update(revs)
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	581 else:
3293 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	582 visit = repo.changelog.heads()
3634 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3632 diff changeset	583 seen = {}
3293 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	584 while visit:
a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	585 n = visit.pop(0)
3634 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3632 diff changeset	586 parents = [p for p in repo.changelog.parents(n) if p not in has]
3293 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	587 if len(parents) == 0:
10479 bb508b312359 bundle: exclude csets given in --base, unless they are in --rev (issue1910) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10448 diff changeset	588 if n not in has:
bb508b312359 bundle: exclude csets given in --base, unless they are in --rev (issue1910) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10448 diff changeset	589 o.append(n)
3293 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3283 diff changeset	590 else:
3509 630e0b216192 fix graph traversal in commands.bundle (it wasn't O(n)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3508 diff changeset	591 for p in parents:
630e0b216192 fix graph traversal in commands.bundle (it wasn't O(n)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3508 diff changeset	592 if p not in seen:
3634 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3632 diff changeset	593 seen[p] = 1
3509 630e0b216192 fix graph traversal in commands.bundle (it wasn't O(n)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3508 diff changeset	594 visit.append(p)
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	595 else:
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	596 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	597 dest, branches = hg.parseurl(dest, opts.get('branch'))
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	598 other = hg.repository(hg.remoteui(repo, opts), dest)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	599 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	600 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	601
10616 65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10606 diff changeset	602 if not o:
65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10606 diff changeset	603 ui.status(_("no changes found\n"))
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	604 return 1
10616 65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10606 diff changeset	605
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	606 if revs:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	607 cg = repo.changegroupsubset(o, revs, 'bundle')
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	608 else:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	609 cg = repo.changegroup(o, 'bundle')
6570 626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	610
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	611 bundletype = opts.get('type', 'bzip2').lower()
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	612 btypes = {'none': 'HG10UN', 'bzip2': 'HG10BZ', 'gzip': 'HG10GZ'}
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	613 bundletype = btypes.get(bundletype)
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	614 if bundletype not in changegroup.bundletypes:
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	615 raise util.Abort(_('unknown bundle type specified with --type'))
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	616
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	617 changegroup.writebundle(cg, fname, bundletype)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	618
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	619 def cat(ui, repo, file1, pats, *opts):
3913 283ee8971570 doc string fix: hg cat and manifest default to current parent revision. Thomas Arendsen Hein <thomas@intevation.de> parents: 3900 diff changeset	620 """output the current or given revision of files
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	621
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	622 Print the specified files as they were at the given revision. If
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	623 no revision is given, the parent of the working directory is used,
3914 3c82ab166eea doc fix: hg tags defaults to current parent revision, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3913 diff changeset	624 or tip if no revision is checked out.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	625
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	626 Output may be to a file, in which case the name of the file is
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	627 given using a format string. The formatting rules are the same as
9892 4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	628 for the export command, with the following additions:
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	629
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	630 :``%s``: basename of file being printed
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	631 :``%d``: dirname of file being printed, or '.' if in repository root
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	632 :``%p``: root-relative path name of file being printed
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	633
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	634 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	635 """
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	636 ctx = repo[opts.get('rev')]
4697 5b2d986de0f8 cat: return an error on failure Matt Mackall <mpm@selenic.com> parents: 4692 diff changeset	637 err = 1
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	638 m = cmdutil.match(repo, (file1,) + pats, opts)
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	639 for abs in ctx.walk(m):
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	640 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	641 data = ctx[abs].data()
6094 3998c1b0828f cat --decode: Drop short option, use opts.get() instead of opts[] Thomas Arendsen Hein <thomas@intevation.de> parents: 6093 diff changeset	642 if opts.get('decode'):
6093 f5b00b6e426a Option --decode for hg cat to apply decode filters. Jesse Glick <jesse.glick@sun.com> parents: 6068 diff changeset	643 data = repo.wwritedata(abs, data)
f5b00b6e426a Option --decode for hg cat to apply decode filters. Jesse Glick <jesse.glick@sun.com> parents: 6068 diff changeset	644 fp.write(data)
4697 5b2d986de0f8 cat: return an error on failure Matt Mackall <mpm@selenic.com> parents: 4692 diff changeset	645 err = 0
5b2d986de0f8 cat: return an error on failure Matt Mackall <mpm@selenic.com> parents: 4692 diff changeset	646 return err
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	647
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	648 def clone(ui, source, dest=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	649 """make a copy of an existing repository
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	650
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	651 Create a copy of an existing repository in a new directory.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	652
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	653 If no destination directory name is specified, it defaults to the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	654 basename of the source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	655
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	656 The location of the source is added to the new repository's
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	657 .hg/hgrc file, as the default to be used for future pulls.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	658
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	659 See :hg:`help urls` for valid source format details.
7942 553cef16031f mention default branch in branch and clone help Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	660
9970 36760956f6d3 commands: mark "ssh://" as inline literals in help texts Martin Geisler <mg@lazybytes.net> parents: 9952 diff changeset	661 It is possible to specify an ``ssh://`` URL as the destination, but no
7942 553cef16031f mention default branch in branch and clone help Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	662 .hg/hgrc and working directory will be created on the remote side.
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	663 Please see :hg:`help urls` for important details about ``ssh://`` URLs.
7942 553cef16031f mention default branch in branch and clone help Matt Mackall <mpm@selenic.com> parents: 7879 diff changeset	664
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	665 A set of changesets (tags, or branch names) to pull may be specified
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	666 by listing each changeset (tag, or branch name) with -r/--rev.
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	667 If -r/--rev is used, the cloned repository will contain only a subset
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	668 of the changesets of the source repository. Only the set of changesets
9806 dafbe321fc1a clone: simplify help text Wagner Bruna <wbruna@softwareexpress.com.br> parents: 9747 diff changeset	669 defined by all -r/--rev options (including all their ancestors)
dafbe321fc1a clone: simplify help text Wagner Bruna <wbruna@softwareexpress.com.br> parents: 9747 diff changeset	670 will be pulled into the destination repository.
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	671 No subsequent changesets (including subsequent tags) will be present
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	672 in the destination.
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	673
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	674 Using -r/--rev (or 'clone src#rev dest') implies --pull, even for
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	675 local source repositories.
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	676
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	677 For efficiency, hardlinks are used for cloning whenever the source
2762 2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	678 and destination are on the same filesystem (note this applies only
10637 7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	679 to the repository data, not to the working directory). Some
2762 2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	680 filesystems, such as AFS, implement hardlinking incorrectly, but
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	681 do not report errors. In these cases, use the --pull option to
2762 2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	682 avoid hardlinking.
2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	683
10637 7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	684 In some cases, you can clone repositories and the working directory
9237 16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	685 using full hardlinks with ::
2762 2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	686
2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	687 $ cp -al REPO REPOCLONE
2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	688
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7982 diff changeset	689 This is the fastest way to clone, but it is not always safe. The
6508 5279848424e7 issue 1053: heavily qualify the "cp -al" advice for cloning Bryan O'Sullivan <bos@serpentine.com> parents: 6465 diff changeset	690 operation is not atomic (making sure REPO is not modified during
5279848424e7 issue 1053: heavily qualify the "cp -al" advice for cloning Bryan O'Sullivan <bos@serpentine.com> parents: 6465 diff changeset	691 the operation is up to you) and you have to make sure your editor
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7982 diff changeset	692 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
6508 5279848424e7 issue 1053: heavily qualify the "cp -al" advice for cloning Bryan O'Sullivan <bos@serpentine.com> parents: 6465 diff changeset	693 this is not compatible with certain extensions that place their
5279848424e7 issue 1053: heavily qualify the "cp -al" advice for cloning Bryan O'Sullivan <bos@serpentine.com> parents: 6465 diff changeset	694 metadata under the .hg directory, such as mq.
10637 7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	695
7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	696 Mercurial will update the working directory to the first applicable
7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	697 revision from this list:
7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	698
10645 ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	699 a) null if -U or the source repository has no changesets
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	700 b) if -u . and the source repository is local, the first parent of
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	701 the source repository's working directory
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	702 c) the changeset specified with -u (if a branch name, this means the
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	703 latest head of that branch)
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	704 d) the changeset specified with -r
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	705 e) the tipmost head specified with -b
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	706 f) the tipmost head specified with the url#branch source syntax
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	707 g) the tipmost head of the default branch
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	708 h) tip
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	709
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	710 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	711 """
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	712 if opts.get('noupdate') and opts.get('updaterev'):
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	713 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	714
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	715 r = hg.clone(hg.remoteui(ui, opts), source, dest,
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	716 pull=opts.get('pull'),
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	717 stream=opts.get('uncompressed'),
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	718 rev=opts.get('rev'),
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	719 update=opts.get('updaterev') or not opts.get('noupdate'),
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	720 branch=opts.get('branch'))
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	721
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	722 return r is None
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	723
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	724 def commit(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	725 """commit the specified files or all outstanding changes
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	726
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7982 diff changeset	727 Commit changes to the given files into the repository. Unlike a
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	728 centralized RCS, this operation is a local operation. See
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	729 :hg:`push` for a way to actively distribute your changes.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	730
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	731 If a list of files is omitted, all changes reported by :hg:`status`
1995 2da2d46862fb Spelling fix: "commited" -> "committed" mcmillen@cs.cmu.edu parents: 1994 diff changeset	732 will be committed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	733
6385 0d4e068e9e52 commit: when committing the results of a merge, it's all or nothing Bryan O'Sullivan <bos@serpentine.com> parents: 6377 diff changeset	734 If you are committing the result of a merge, do not provide any
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	735 filenames or -I/-X filters.
6385 0d4e068e9e52 commit: when committing the results of a merge, it's all or nothing Bryan O'Sullivan <bos@serpentine.com> parents: 6377 diff changeset	736
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	737 If no commit message is specified, the configured editor is
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	738 started to prompt you for a message.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	739
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	740 See :hg:`help dates` for a list of formats valid for -d/--date.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	741
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	742 Returns 0 on success, 1 if nothing changed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	743 """
7655 cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	744 extra = {}
cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	745 if opts.get('close_branch'):
11163 acd61dc44a39 commit: prevent closing non-head changesets Gilles Moris <gilles.moris@free.fr> parents: 11104 diff changeset	746 if repo['.'].node() not in repo.branchheads():
acd61dc44a39 commit: prevent closing non-head changesets Gilles Moris <gilles.moris@free.fr> parents: 11104 diff changeset	747 # The topo heads set is included in the branch heads set of the
acd61dc44a39 commit: prevent closing non-head changesets Gilles Moris <gilles.moris@free.fr> parents: 11104 diff changeset	748 # current branch, so it's sufficient to test branchheads
acd61dc44a39 commit: prevent closing non-head changesets Gilles Moris <gilles.moris@free.fr> parents: 11104 diff changeset	749 raise util.Abort(_('can only close branch heads'))
7655 cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	750 extra['close'] = 1
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	751 e = cmdutil.commiteditor
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	752 if opts.get('force_editor'):
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	753 e = cmdutil.commitforceeditor
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	754
6600 b822a379860b match: stop passing files through commitfunc Matt Mackall <mpm@selenic.com> parents: 6599 diff changeset	755 def commitfunc(ui, repo, message, match, opts):
8706 25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8704 diff changeset	756 return repo.commit(message, opts.get('user'), opts.get('date'), match,
25e9c71b89de commit: drop the now-unused files parameter Matt Mackall <mpm@selenic.com> parents: 8704 diff changeset	757 editor=e, extra=extra)
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6321 diff changeset	758
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	759 branch = repo[None].branch()
5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	760 bheads = repo.branchheads(branch)
5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	761
6369 53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	762 node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	763 if not node:
8995 7b19cda0fa10 commit: lose some pointless 'nothing changed' messages Matt Mackall <mpm@selenic.com> parents: 8992 diff changeset	764 ui.status(_("nothing changed\n"))
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	765 return 1
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	766
5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	767 ctx = repo[node]
5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	768 parents = ctx.parents()
5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	769
11317 b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	770 if bheads and not [x for x in parents
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	771 if x.node() in bheads and x.branch() == branch]:
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6321 diff changeset	772 ui.status(_('created new head\n'))
11317 b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	773 # The message is not printed for initial roots. For the other
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	774 # changesets, it is printed in the following situations:
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	775 #
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	776 # Par column: for the 2 parents with ...
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	777 # N: null or no parent
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	778 # B: parent is on another named branch
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	779 # C: parent is a regular non head changeset
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	780 # H: parent was a branch head of the current branch
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	781 # Msg column: whether we print "created new head" message
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	782 # In the following, it is assumed that there already exists some
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	783 # initial branch heads of the current branch, otherwise nothing is
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	784 # printed anyway.
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	785 #
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	786 # Par Msg Comment
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	787 # NN y additional topo root
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	788 #
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	789 # BN y additional branch root
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	790 # CN y additional topo head
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	791 # HN n usual case
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	792 #
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	793 # BB y weird additional branch root
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	794 # CB y branch merge
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	795 # HB n merge with named branch
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	796 #
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	797 # CC y additional head from merge
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	798 # CH n merge with a head
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	799 #
b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11311 diff changeset	800 # HH n head merge: head count decreases
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	801
11164 e84600b0d81b commit: inform the commiter when resurrecting a closed changeset Gilles Moris <gilles.moris@free.fr> parents: 11163 diff changeset	802 if not opts.get('close_branch'):
e84600b0d81b commit: inform the commiter when resurrecting a closed changeset Gilles Moris <gilles.moris@free.fr> parents: 11163 diff changeset	803 for r in parents:
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	804 if r.extra().get('close'):
11164 e84600b0d81b commit: inform the commiter when resurrecting a closed changeset Gilles Moris <gilles.moris@free.fr> parents: 11163 diff changeset	805 ui.status(_('reopening closed branch head %d\n') % r)
e84600b0d81b commit: inform the commiter when resurrecting a closed changeset Gilles Moris <gilles.moris@free.fr> parents: 11163 diff changeset	806
6935 03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing. Gilles Moris <gilles.moris@free.fr> parents: 6934 diff changeset	807 if ui.debugflag:
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	808 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx.hex()))
6935 03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing. Gilles Moris <gilles.moris@free.fr> parents: 6934 diff changeset	809 elif ui.verbose:
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 11169 diff changeset	810 ui.write(_('committed changeset %d:%s\n') % (int(ctx), ctx))
6935 03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing. Gilles Moris <gilles.moris@free.fr> parents: 6934 diff changeset	811
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	812 def copy(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	813 """mark files as copied for the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	814
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	815 Mark dest as having copies of source files. If dest is a
cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	816 directory, copies are put in that directory. If dest is a file,
7805 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	817 the source must be a single file.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	818
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	819 By default, this command copies the contents of files as they
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	820 exist in the working directory. If invoked with -A/--after, the
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	821 operation is recorded, but no copying is performed.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	822
7805 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	823 This command takes effect with the next commit. To undo a copy
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	824 before that, see :hg:`revert`.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	825
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	826 Returns 0 on success, 1 if errors are encountered.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	827 """
4958 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4950 diff changeset	828 wlock = repo.wlock(False)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	829 try:
5626 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5619 diff changeset	830 return cmdutil.copy(ui, repo, pats, opts)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	831 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	832 wlock.release()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	833
6189 81cbb5dfdec0 Make hg debugancestor accept -R by making it an optionalrepo command. Thomas Arendsen Hein <thomas@intevation.de> parents: 6188 diff changeset	834 def debugancestor(ui, repo, *args):
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	835 """find the ancestor revision of two revisions in a given index"""
6188 3b0c2b71e0d7 debugancestor: use args instead of opts, to not confuse with option dicts. Thomas Arendsen Hein <thomas@intevation.de> parents: 6182 diff changeset	836 if len(args) == 3:
3b0c2b71e0d7 debugancestor: use args instead of opts, to not confuse with option dicts. Thomas Arendsen Hein <thomas@intevation.de> parents: 6182 diff changeset	837 index, rev1, rev2 = args
6178 81afdd016867 debugancestor: make the index argument optional, defaulting to 00changelog.i Bryan O'Sullivan <bos@serpentine.com> parents: 6171 diff changeset	838 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index)
6253 a7e3d0456d92 debugancestor: use repo.lookup when no revlog was specified Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6243 diff changeset	839 lookup = r.lookup
6188 3b0c2b71e0d7 debugancestor: use args instead of opts, to not confuse with option dicts. Thomas Arendsen Hein <thomas@intevation.de> parents: 6182 diff changeset	840 elif len(args) == 2:
6189 81cbb5dfdec0 Make hg debugancestor accept -R by making it an optionalrepo command. Thomas Arendsen Hein <thomas@intevation.de> parents: 6188 diff changeset	841 if not repo:
81cbb5dfdec0 Make hg debugancestor accept -R by making it an optionalrepo command. Thomas Arendsen Hein <thomas@intevation.de> parents: 6188 diff changeset	842 raise util.Abort(_("There is no Mercurial repository here "
81cbb5dfdec0 Make hg debugancestor accept -R by making it an optionalrepo command. Thomas Arendsen Hein <thomas@intevation.de> parents: 6188 diff changeset	843 "(.hg not found)"))
6188 3b0c2b71e0d7 debugancestor: use args instead of opts, to not confuse with option dicts. Thomas Arendsen Hein <thomas@intevation.de> parents: 6182 diff changeset	844 rev1, rev2 = args
6178 81afdd016867 debugancestor: make the index argument optional, defaulting to 00changelog.i Bryan O'Sullivan <bos@serpentine.com> parents: 6171 diff changeset	845 r = repo.changelog
6253 a7e3d0456d92 debugancestor: use repo.lookup when no revlog was specified Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6243 diff changeset	846 lookup = repo.lookup
6178 81afdd016867 debugancestor: make the index argument optional, defaulting to 00changelog.i Bryan O'Sullivan <bos@serpentine.com> parents: 6171 diff changeset	847 else:
81afdd016867 debugancestor: make the index argument optional, defaulting to 00changelog.i Bryan O'Sullivan <bos@serpentine.com> parents: 6171 diff changeset	848 raise util.Abort(_('either two or three arguments required'))
6253 a7e3d0456d92 debugancestor: use repo.lookup when no revlog was specified Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6243 diff changeset	849 a = r.ancestor(lookup(rev1), lookup(rev2))
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	850 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	851
11337 0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	852 def debugbuilddag(ui, repo, text,
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	853 mergeable_file=False,
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	854 appended_file=False,
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	855 overwritten_file=False,
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	856 new_file=False):
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	857 """builds a repo with a given dag from scratch in the current empty repo
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	858
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	859 Elements:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	860
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	861 - "+n" is a linear run of n nodes based on the current default parent
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	862 - "." is a single node based on the current default parent
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	863 - "$" resets the default parent to null (implied at the start);
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	864 otherwise the default parent is always the last node created
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	865 - "<p" sets the default parent to the backref p
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	866 - "*p" is a fork at parent p, which is a backref
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	867 - "*p1/p2" is a merge of parents p1 and p2, which are backrefs
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	868 - "/p2" is a merge of the preceding node and p2
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	869 - ":tag" defines a local tag for the preceding node
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	870 - "@branch" sets the named branch for subsequent nodes
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	871 - "!command" runs the command using your shell
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	872 - "!!my command\\n" is like "!", but to the end of the line
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	873 - "#...\\n" is a comment up to the end of the line
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	874
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	875 Whitespace between the above elements is ignored.
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	876
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	877 A backref is either
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	878
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	879 - a number n, which references the node curr-n, where curr is the current
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	880 node, or
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	881 - the name of a local tag you placed earlier using ":tag", or
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	882 - empty to denote the default parent.
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	883
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	884 All string valued-elements are either strictly alphanumeric, or must
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	885 be enclosed in double quotes ("..."), with "\" as escape character.
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	886
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	887 Note that the --overwritten-file and --appended-file options imply the
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	888 use of "HGMERGE=internal:local" during DAG buildup.
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	889 """
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	890
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	891 if not (mergeable_file or appended_file or overwritten_file or new_file):
11342 aecabad8dd7a commands: get rid of generic exception in debugbuilddag Martin Geisler <mg@aragost.com> parents: 11338 diff changeset	892 raise util.Abort(_('need at least one of -m, -a, -o, -n'))
11337 0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	893
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	894 if len(repo.changelog) > 0:
11342 aecabad8dd7a commands: get rid of generic exception in debugbuilddag Martin Geisler <mg@aragost.com> parents: 11338 diff changeset	895 raise util.Abort(_('repository is not empty'))
11337 0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	896
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	897 if overwritten_file or appended_file:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	898 # we don't want to fail in merges during buildup
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	899 os.environ['HGMERGE'] = 'internal:local'
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	900
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	901 def writefile(fname, text, fmode="w"):
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	902 f = open(fname, fmode)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	903 try:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	904 f.write(text)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	905 finally:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	906 f.close()
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	907
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	908 if mergeable_file:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	909 linesperrev = 2
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	910 # determine number of revs in DAG
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	911 n = 0
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	912 for type, data in dagparser.parsedag(text):
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	913 if type == 'n':
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	914 n += 1
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	915 # make a file with k lines per rev
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	916 writefile("mf", "\n".join(str(i) for i in xrange(0, n * linesperrev))
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	917 + "\n")
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	918
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	919 at = -1
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	920 atbranch = 'default'
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	921 for type, data in dagparser.parsedag(text):
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	922 if type == 'n':
11338 285bcf40e04b commands: format is a Python2.6 function Martin Geisler <mg@aragost.com> parents: 11337 diff changeset	923 ui.status('node %s\n' % str(data))
11337 0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	924 id, ps = data
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	925 p1 = ps[0]
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	926 if p1 != at:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	927 update(ui, repo, node=p1, clean=True)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	928 at = p1
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	929 if repo.dirstate.branch() != atbranch:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	930 branch(ui, repo, atbranch, force=True)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	931 if len(ps) > 1:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	932 p2 = ps[1]
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	933 merge(ui, repo, node=p2)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	934
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	935 if mergeable_file:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	936 f = open("mf", "r+")
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	937 try:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	938 lines = f.read().split("\n")
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	939 lines[id * linesperrev] += " r%i" % id
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	940 f.seek(0)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	941 f.write("\n".join(lines))
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	942 finally:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	943 f.close()
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	944
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	945 if appended_file:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	946 writefile("af", "r%i\n" % id, "a")
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	947
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	948 if overwritten_file:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	949 writefile("of", "r%i\n" % id)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	950
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	951 if new_file:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	952 writefile("nf%i" % id, "r%i\n" % id)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	953
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	954 commit(ui, repo, addremove=True, message="r%i" % id, date=(id, 0))
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	955 at = id
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	956 elif type == 'l':
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	957 id, name = data
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	958 ui.status('tag %s\n' % name)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	959 tag(ui, repo, name, local=True)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	960 elif type == 'a':
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	961 ui.status('branch %s\n' % data)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	962 atbranch = data
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	963 elif type in 'cC':
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	964 r = util.system(data, cwd=repo.root)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	965 if r:
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	966 desc, r = util.explain_exit(r)
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	967 raise util.Abort(_('%s command %s') % (data, desc))
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	968
7879 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	969 def debugcommands(ui, cmd='', *args):
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	970 """list all available commands and options"""
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	971 for cmd, vals in sorted(table.iteritems()):
7879 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	972 cmd = cmd.split('\|')[0].strip('^')
7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	973 opts = ', '.join([i[1] for i in vals[1]])
7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	974 ui.write('%s: %s\n' % (cmd, opts))
7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	975
2034 5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	976 def debugcomplete(ui, cmd='', **opts):
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	977 """returns the completion list associated with the given command"""
2034 5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	978
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	979 if opts.get('options'):
2034 5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	980 options = []
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	981 otables = [globalopts]
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	982 if cmd:
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7212 diff changeset	983 aliases, entry = cmdutil.findcmd(cmd, table, False)
2034 5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	984 otables.append(entry[1])
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	985 for t in otables:
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	986 for o in t:
10958 021d5ac3bec0 debugcomplete: don't list deprecated options Matt Mackall <mpm@selenic.com> parents: 10957 diff changeset	987 if "(DEPRECATED)" in o[3]:
021d5ac3bec0 debugcomplete: don't list deprecated options Matt Mackall <mpm@selenic.com> parents: 10957 diff changeset	988 continue
2034 5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	989 if o[0]:
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	990 options.append('-%s' % o[0])
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	991 options.append('--%s' % o[1])
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	992 ui.write("%s\n" % "\n".join(options))
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	993 return
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	994
7509 62e5d41b0a8b Make debugcomplete -v print aliases as well as commands Brendan Cully <brendan@kublai.com> parents: 7449 diff changeset	995 cmdlist = cmdutil.findpossible(cmd, table)
62e5d41b0a8b Make debugcomplete -v print aliases as well as commands Brendan Cully <brendan@kublai.com> parents: 7449 diff changeset	996 if ui.verbose:
62e5d41b0a8b Make debugcomplete -v print aliases as well as commands Brendan Cully <brendan@kublai.com> parents: 7449 diff changeset	997 cmdlist = [' '.join(c[0]) for c in cmdlist.values()]
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	998 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	999
5745 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5720 diff changeset	1000 def debugfsinfo(ui, path = "."):
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1001 """show information detected about current filesystem"""
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 9012 diff changeset	1002 open('.debugfsinfo', 'w').write('')
5745 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5720 diff changeset	1003 ui.write('exec: %s\n' % (util.checkexec(path) and 'yes' or 'no'))
8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5720 diff changeset	1004 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
6748 1dca460e7d1e rename checkfolding to checkcase Matt Mackall <mpm@selenic.com> parents: 6745 diff changeset	1005 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
5745 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5720 diff changeset	1006 and 'yes' or 'no'))
8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5720 diff changeset	1007 os.unlink('.debugfsinfo')
8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5720 diff changeset	1008
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	1009 def debugrebuildstate(ui, repo, rev="tip"):
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1010 """rebuild the dirstate as it would look like for the given revision"""
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	1011 ctx = repo[rev]
1760 13f8e068d13c fix typo in debugrebuildstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	1012 wlock = repo.wlock()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1013 try:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	1014 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	1015 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	1016 wlock.release()
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1017
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1018 def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1019 """validate the correctness of the current dirstate"""
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1020 parent1, parent2 = repo.dirstate.parents()
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	1021 m1 = repo[parent1].manifest()
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	1022 m2 = repo[parent2].manifest()
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1023 errors = 0
4950 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	1024 for f in repo.dirstate:
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	1025 state = repo.dirstate[f]
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1026 if state in "nr" and f not in m1:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1027 ui.warn(_("%s in state %s, but not in manifest1\n") % (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1028 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1029 if state in "a" and f in m1:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1030 ui.warn(_("%s in state %s, but also in manifest1\n") % (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1031 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1032 if state in "m" and f not in m1 and f not in m2:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1033 ui.warn(_("%s in state %s, but not in either manifest\n") %
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1034 (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1035 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1036 for f in m1:
4950 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4948 diff changeset	1037 state = repo.dirstate[f]
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1038 if state not in "nrm":
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1039 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1040 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1041 if errors:
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1042 error = _(".hg/dirstate inconsistent with current parent's manifest")
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1043 raise util.Abort(error)
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1044
3539 e1508621e9ef add --untrusted to showconfig Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3524 diff changeset	1045 def showconfig(ui, repo, values, *opts):
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1046 """show combined config settings from all hgrc files
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1047
8664 f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1048 With no arguments, print names and values of all config items.
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1049
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1050 With one argument of the form section.name, print just the value
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1051 of that config item.
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1052
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1053 With multiple arguments, print names and values of all config
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	1054 items with matching section names.
8277 602ed4982f36 commands: describe --debug in showconfig help Martin Geisler <mg@lazybytes.net> parents: 8275 diff changeset	1055
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1056 With --debug, the source (filename and line number) is printed
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1057 for each config item.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1058
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1059 Returns 0 on success.
8277 602ed4982f36 commands: describe --debug in showconfig help Martin Geisler <mg@lazybytes.net> parents: 8275 diff changeset	1060 """
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1061
11048 9e643a0c3278 showconfig: show rc paths with --debug Mads Kiilerich <mads@kiilerich.com> parents: 11009 diff changeset	1062 for f in util.rcpath():
9e643a0c3278 showconfig: show rc paths with --debug Mads Kiilerich <mads@kiilerich.com> parents: 11009 diff changeset	1063 ui.debug(_('read config from: %s\n') % f)
3539 e1508621e9ef add --untrusted to showconfig Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3524 diff changeset	1064 untrusted = bool(opts.get('untrusted'))
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1065 if values:
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1066 if len([v for v in values if '.' in v]) > 1:
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1067 raise util.Abort(_('only one config item permitted'))
3539 e1508621e9ef add --untrusted to showconfig Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3524 diff changeset	1068 for section, name, value in ui.walkconfig(untrusted=untrusted):
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1069 sectname = section + '.' + name
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1070 if values:
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1071 for v in values:
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1072 if v == section:
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1073 ui.debug('%s: ' %
b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1074 ui.configsource(section, name, untrusted))
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1075 ui.write('%s=%s\n' % (sectname, value))
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1076 elif v == sectname:
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1077 ui.debug('%s: ' %
b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1078 ui.configsource(section, name, untrusted))
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1079 ui.write(value, '\n')
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1080 else:
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1081 ui.debug('%s: ' %
b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	1082 ui.configsource(section, name, untrusted))
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	1083 ui.write('%s=%s\n' % (sectname, value))
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1084
11371 4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1085 def debugpushkey(ui, repopath, namespace, *keyinfo):
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1086 '''access the pushkey key/value protocol
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1087
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1088 With two args, list the keys in the given namespace.
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1089
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1090 With five args, set a key to new if it currently is set to old.
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1091 Reports success or failure.
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1092 '''
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1093
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1094 target = hg.repository(ui, repopath)
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1095 if keyinfo:
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1096 key, old, new = keyinfo
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1097 r = target.pushkey(namespace, key, old, new)
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1098 ui.status(str(r) + '\n')
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1099 return not(r)
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1100 else:
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1101 for k, v in target.listkeys(namespace).iteritems():
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1102 ui.write("%s\t%s\n" % (k.encode('string-escape'),
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1103 v.encode('string-escape')))
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	1104
11276 f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1105 def debugrevspec(ui, repo, expr):
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1106 '''parse and apply a revision specification'''
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1107 if ui.verbose:
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1108 tree = revset.parse(expr)
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1109 ui.note(tree, "\n")
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1110 func = revset.match(expr)
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1111 for c in func(repo, range(len(repo))):
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1112 ui.write("%s\n" % c)
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	1113
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1114 def debugsetparents(ui, repo, rev1, rev2=None):
1470 fb9b84c91222 minor fix on command help docstrings TK Soh <teekaysoh@yahoo.com> parents: 1469 diff changeset	1115 """manually set the parents of the current working directory
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1116
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1117 This is useful for writing repository conversion tools, but should
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1118 be used with care.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1119
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1120 Returns 0 on success.
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1121 """
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1122
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1123 if not rev2:
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1124 rev2 = hex(nullid)
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1125
4249 89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	1126 wlock = repo.wlock()
89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	1127 try:
89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	1128 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	1129 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	1130 wlock.release()
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1131
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1132 def debugstate(ui, repo, nodates=None):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1133 """show the contents of the current dirstate"""
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1134 timestr = ""
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1135 showdate = not nodates
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	1136 for file_, ent in sorted(repo.dirstate._map.iteritems()):
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1137 if showdate:
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1138 if ent[3] == -1:
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1139 # Pad or slice to locale representation
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1140 locale_len = len(time.strftime("%Y-%m-%d %H:%M:%S ",
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1141 time.localtime(0)))
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1142 timestr = 'unset'
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1143 timestr = (timestr[:locale_len] +
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1144 ' ' * (locale_len - len(timestr)))
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1145 else:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1146 timestr = time.strftime("%Y-%m-%d %H:%M:%S ",
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1147 time.localtime(ent[3]))
5139 49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5138 diff changeset	1148 if ent[1] & 020000:
49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5138 diff changeset	1149 mode = 'lnk'
49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5138 diff changeset	1150 else:
49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5138 diff changeset	1151 mode = '%3o' % (ent[1] & 0777)
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	1152 ui.write("%c %s %10d %s%s\n" % (ent[0], mode, ent[2], timestr, file_))
3159 e43fd1623fe1 fix users of dirstate.copies broken by b1f10d3223c1 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3146 diff changeset	1153 for f in repo.dirstate.copies():
e43fd1623fe1 fix users of dirstate.copies broken by b1f10d3223c1 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3146 diff changeset	1154 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1155
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1156 def debugsub(ui, repo, rev=None):
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1157 if rev == '':
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1158 rev = None
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1159 for k, v in sorted(repo[rev].substate.items()):
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1160 ui.write('path %s\n' % k)
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1161 ui.write(' source %s\n' % v[0])
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1162 ui.write(' revision %s\n' % v[1])
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	1163
11336 3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1164 def debugdag(ui, repo, file_=None, revs, *opts):
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1165 """format the changelog or an index DAG as a concise textual description
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1166
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1167 If you pass a revlog index, the revlog's DAG is emitted. If you list
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1168 revision numbers, they get labelled in the output as rN.
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1169
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1170 Otherwise, the changelog DAG of the current repo is emitted.
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1171 """
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1172 spaces = opts.get('spaces')
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1173 dots = opts.get('dots')
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1174 if file_:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1175 rlog = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1176 revs = set((int(r) for r in revs))
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1177 def events():
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1178 for r in rlog:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1179 yield 'n', (r, list(set(p for p in rlog.parentrevs(r) if p != -1)))
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1180 if r in revs:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1181 yield 'l', (r, "r%i" % r)
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1182 elif repo:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1183 cl = repo.changelog
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1184 tags = opts.get('tags')
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1185 branches = opts.get('branches')
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1186 if tags:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1187 labels = {}
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1188 for l, n in repo.tags().items():
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1189 labels.setdefault(cl.rev(n), []).append(l)
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1190 def events():
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1191 b = "default"
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1192 for r in cl:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1193 if branches:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1194 newb = cl.read(cl.node(r))[5]['branch']
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1195 if newb != b:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1196 yield 'a', newb
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1197 b = newb
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1198 yield 'n', (r, list(set(p for p in cl.parentrevs(r) if p != -1)))
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1199 if tags:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1200 ls = labels.get(r)
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1201 if ls:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1202 for l in ls:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1203 yield 'l', (r, l)
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1204 else:
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1205 raise util.Abort(_('need repo for changelog dag'))
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1206
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1207 for line in dagparser.dagtextlines(events(),
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1208 addspaces=spaces,
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1209 wraplabels=True,
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1210 wrapannotations=True,
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1211 wrapnonlinear=dots,
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1212 usedots=dots,
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1213 maxlinewidth=70):
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1214 ui.write(line)
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1215 ui.write("\n")
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	1216
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1217 def debugdata(ui, file_, rev):
4267 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4266 diff changeset	1218 """dump the contents of a data file revision"""
b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4266 diff changeset	1219 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_[:-2] + ".i")
1313 1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1220 try:
1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1221 ui.write(r.revision(r.lookup(rev)))
1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1222 except KeyError:
3069 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 3068 diff changeset	1223 raise util.Abort(_('invalid revision identifier %s') % rev)
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1224
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1225 def debugdate(ui, date, range=None, **opts):
3807 299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	1226 """parse and display a date"""
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1227 if opts["extended"]:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1228 d = util.parsedate(date, util.extendeddateformats)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1229 else:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1230 d = util.parsedate(date)
3807 299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	1231 ui.write("internal: %s %s\n" % d)
299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	1232 ui.write("standard: %s\n" % util.datestr(d))
3815 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1233 if range:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1234 m = util.matchdate(range)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3807 diff changeset	1235 ui.write("match: %s\n" % m(d[0]))
3807 299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	1236
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1237 def debugindex(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1238 """dump the contents of an index file"""
4267 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4266 diff changeset	1239 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
7730 26bdb7109170 commands: removed unnecessary string concatenation Martin Geisler <mg@daimi.au.dk> parents: 7695 diff changeset	1240 ui.write(" rev offset length base linkrev"
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	1241 " nodeid p1 p2\n")
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6751 diff changeset	1242 for i in r:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1243 node = r.node(i)
5321 599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	1244 try:
599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	1245 pp = r.parents(node)
599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	1246 except:
599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	1247 pp = [nullid, nullid]
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	1248 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	1249 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1250 short(node), short(pp[0]), short(pp[1])))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1251
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1252 def debugindexdot(ui, file_):
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1253 """dump an index DAG as a graphviz dot file"""
4267 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4266 diff changeset	1254 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1255 ui.write("digraph G {\n")
6752 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6751 diff changeset	1256 for i in r:
2287 3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	1257 node = r.node(i)
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	1258 pp = r.parents(node)
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	1259 ui.write("\t%d -> %d\n" % (r.rev(pp[0]), i))
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	1260 if pp[1] != nullid:
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	1261 ui.write("\t%d -> %d\n" % (r.rev(pp[1]), i))
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1262 ui.write("}\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1263
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1264 def debuginstall(ui):
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1265 '''test Mercurial installation
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1266
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1267 Returns 0 on success.
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1268 '''
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1269
3846 18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1270 def writetemp(contents):
4836 035489f60842 Use a prefix for debuginstall tempfiles. Thomas Arendsen Hein <thomas@intevation.de> parents: 4819 diff changeset	1271 (fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
3846 18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1272 f = os.fdopen(fd, "wb")
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1273 f.write(contents)
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1274 f.close()
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1275 return name
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1276
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1277 problems = 0
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1278
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1279 # encoding
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	1280 ui.status(_("Checking encoding (%s)...\n") % encoding.encoding)
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1281 try:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	1282 encoding.fromlocal("test")
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1283 except util.Abort, inst:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1284 ui.write(" %s\n" % inst)
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1285 ui.write(_(" (check that your locale is properly set)\n"))
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1286 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1287
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1288 # compiled modules
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1289 ui.status(_("Checking extensions...\n"))
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1290 try:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1291 import bdiff, mpatch, base85
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1292 except Exception, inst:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1293 ui.write(" %s\n" % inst)
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1294 ui.write(_(" One or more extensions could not be found"))
8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1295 ui.write(_(" (check that you compiled the extensions)\n"))
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1296 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1297
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1298 # templates
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1299 ui.status(_("Checking templates...\n"))
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1300 try:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1301 import templater
7873 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7850 diff changeset	1302 templater.templater(templater.templatepath("map-cmdline.default"))
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1303 except Exception, inst:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1304 ui.write(" %s\n" % inst)
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1305 ui.write(_(" (templates seem to have been installed incorrectly)\n"))
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1306 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1307
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1308 # patch
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1309 ui.status(_("Checking patch...\n"))
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1310 patchproblems = 0
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1311 a = "1\n2\n3\n4\n"
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1312 b = "1\n2\n3\ninsert\n4\n"
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1313 fa = writetemp(a)
5491 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5405 diff changeset	1314 d = mdiff.unidiff(a, None, b, None, os.path.basename(fa),
e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5405 diff changeset	1315 os.path.basename(fa))
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1316 fd = writetemp(d)
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1317
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1318 files = {}
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1319 try:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1320 patch.patch(fd, ui, cwd=os.path.dirname(fa), files=files)
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1321 except util.Abort, e:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1322 ui.write(_(" patch call failed:\n"))
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1323 ui.write(" " + str(e) + "\n")
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1324 patchproblems += 1
3846 18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1325 else:
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1326 if list(files) != [os.path.basename(fa)]:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1327 ui.write(_(" unexpected patch output!\n"))
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1328 patchproblems += 1
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 9012 diff changeset	1329 a = open(fa).read()
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1330 if a != b:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1331 ui.write(_(" patch test failed!\n"))
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1332 patchproblems += 1
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1333
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1334 if patchproblems:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1335 if ui.config('ui', 'patch'):
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1336 ui.write(_(" (Current patch tool may be incompatible with patch,"
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1337 " or misconfigured. Please check your .hgrc file)\n"))
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4505 diff changeset	1338 else:
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5745 diff changeset	1339 ui.write(_(" Internal patcher failure, please report this error"
8936 1de6e7e1bb9f change wiki/bts URLs to point to new hostname Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8931 diff changeset	1340 " to http://mercurial.selenic.com/bts/\n"))
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1341 problems += patchproblems
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1342
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1343 os.unlink(fa)
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1344 os.unlink(fd)
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1345
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1346 # editor
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1347 ui.status(_("Checking commit editor...\n"))
5664 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5662 diff changeset	1348 editor = ui.geteditor()
4482 62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4438 diff changeset	1349 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1350 if not cmdpath:
3855 b9cdd6f2aa43 debuginstall: fix a copy/paste error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3848 diff changeset	1351 if editor == 'vi':
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1352 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1353 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1354 else:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1355 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1356 ui.write(_(" (specify a commit editor in your .hgrc file)\n"))
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1357 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1358
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1359 # check username
8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1360 ui.status(_("Checking username...\n"))
9734 36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1361 try:
36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1362 user = ui.username()
36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1363 except util.Abort, e:
36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1364 ui.write(" %s\n" % e)
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1365 ui.write(_(" (specify a username in your .hgrc file)\n"))
9734 36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1366 problems += 1
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1367
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1368 if not problems:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1369 ui.status(_("No problems detected\n"))
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1370 else:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1371 ui.write(_("%s problems detected,"
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1372 " please check your install!\n") % problems)
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1373
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1374 return problems
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1375
3659 f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3658 diff changeset	1376 def debugrename(ui, repo, file1, pats, *opts):
1194 c165cbf56bb1 Add doc string for debugrename. bos@serpentine.internal.keyresearch.com parents: 1193 diff changeset	1377 """dump rename information"""
3659 f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3658 diff changeset	1378
6750 c6cc35a3d1de make debugrename work on p1, not tip Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	1379 ctx = repo[opts.get('rev')]
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1380 m = cmdutil.match(repo, (file1,) + pats, opts)
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1381 for abs in ctx.walk(m):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	1382 fctx = ctx[abs]
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1383 o = fctx.filelog().renamed(fctx.filenode())
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	1384 rel = m.rel(abs)
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1385 if o:
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1386 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3659 f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3658 diff changeset	1387 else:
f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3658 diff changeset	1388 ui.write(_("%s not renamed\n") % rel)
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1389
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1390 def debugwalk(ui, repo, pats, *opts):
1053 1539ca091d86 Added missing doc strings for two new debug commmands. Thomas Arendsen Hein <thomas@intevation.de> parents: 1052 diff changeset	1391 """show how files match on given patterns"""
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1392 m = cmdutil.match(repo, pats, opts)
6585 d3d1d39da2fa walk: remove cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6584 diff changeset	1393 items = list(repo.walk(m))
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1394 if not items:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1395 return
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1396 fmt = 'f %%-%ds %%-%ds %%s' % (
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1397 max([len(abs) for abs in items]),
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1398 max([len(m.rel(abs)) for abs in items]))
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1399 for abs in items:
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1400 line = fmt % (abs, m.rel(abs), m.exact(abs) and 'exact' or '')
1309 332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1401 ui.write("%s\n" % line.rstrip())
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1402
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	1403 def diff(ui, repo, pats, *opts):
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	1404 """diff repository (or selected files)
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1405
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1406 Show differences between revisions for the specified files.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1407
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1408 Differences between files are shown using the unified diff format.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1409
3828 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	1410 NOTE: diff may generate unexpected results for merges, as it will
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	1411 default to comparing against the working directory's first parent
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	1412 changeset if no revisions are specified.
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	1413
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1414 When two revision arguments are given, then changes are shown
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1415 between those revisions. If only one revision is specified then
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1416 that revision is compared to the working directory, and, when no
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1417 revisions are specified, the working directory files are compared
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1418 to its parent.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1419
10527 9c0ba837dc65 commands: correct diff -c explanation timeless <timeless@mozdev.org> parents: 10520 diff changeset	1420 Alternatively you can specify -c/--change with a revision to see
9c0ba837dc65 commands: correct diff -c explanation timeless <timeless@mozdev.org> parents: 10520 diff changeset	1421 the changes in that changeset relative to its first parent.
10520 75361931884d commands: mention diff -c timeless <timeless@mozdev.org> parents: 10515 diff changeset	1422
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1423 Without the -a/--text option, diff will avoid generating diffs of
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1424 files it detects as binary. With -a, diff will generate a diff
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1425 anyway, probably with undesirable results.
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1426
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1427 Use the -g/--git option to generate diffs in the git extended diff
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	1428 format. For more information, read :hg:`help diffs`.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1429
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1430 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1431 """
7628 9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1432
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1433 revs = opts.get('rev')
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1434 change = opts.get('change')
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1435 stat = opts.get('stat')
9857 24bc6e414610 diff: change --inverse to --reverse Martin Geisler <mg@lazybytes.net> parents: 9839 diff changeset	1436 reverse = opts.get('reverse')
7628 9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1437
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1438 if revs and change:
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1439 msg = _('cannot specify --rev and --change at the same time')
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1440 raise util.Abort(msg)
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1441 elif change:
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1442 node2 = repo.lookup(change)
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1443 node1 = repo[node2].parents()[0].node()
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1444 else:
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1445 node1, node2 = cmdutil.revpair(repo, revs)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1446
9857 24bc6e414610 diff: change --inverse to --reverse Martin Geisler <mg@lazybytes.net> parents: 9839 diff changeset	1447 if reverse:
9725 3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9718 diff changeset	1448 node1, node2 = node2, node1
3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9718 diff changeset	1449
9642 7d17794f08a9 diffstat: with --git, mark binary files with Bin Brodie Rao <me+hg@dackz.net> parents: 9640 diff changeset	1450 diffopts = patch.diffopts(ui, opts)
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	1451 m = cmdutil.match(repo, pats, opts)
11050 5d35f7d93514 commands: refactor diff --stat and qdiff --stat Yuya Nishihara <yuya@tcha.org> parents: 11048 diff changeset	1452 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat)
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	1453
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1454 def export(ui, repo, changesets, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1455 """dump the header and diffs for one or more changesets
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1456
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1457 Print the changeset header and diffs for one or more revisions.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1458
10332 3d75c691b77d commands: fix the list of changeset header information in 'hg help export' Steve Losh <steve@stevelosh.com> parents: 10331 diff changeset	1459 The information shown in the changeset header is: author, date,
10333 6ae4f390ec61 commands: fix more changeset header information in 'hg help export' Steve Losh <steve@stevelosh.com> parents: 10332 diff changeset	1460 branch name (if non-default), changeset hash, parent(s) and commit
6ae4f390ec61 commands: fix more changeset header information in 'hg help export' Steve Losh <steve@stevelosh.com> parents: 10332 diff changeset	1461 comment.
3828 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	1462
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1463 NOTE: export may generate unexpected diff output for merge
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1464 changesets, as it will compare the merge changeset against its
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1465 first parent only.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1466
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1467 Output may be to a file, in which case the name of the file is
9892 4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1468 given using a format string. The formatting rules are as follows:
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1469
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1470 :``%%``: literal "%" character
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1471 :``%H``: changeset hash (40 bytes of hexadecimal)
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1472 :``%N``: number of patches being generated
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1473 :``%R``: changeset revision number
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1474 :``%b``: basename of the exporting repository
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1475 :``%h``: short-form changeset hash (12 bytes of hexadecimal)
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1476 :``%n``: zero-padded sequence number, starting at 1
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1477 :``%r``: zero-padded changeset revision number
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1478
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1479 Without the -a/--text option, export will avoid generating diffs
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1480 of files it detects as binary. With -a, export will generate a
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1481 diff anyway, probably with undesirable results.
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1482
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1483 Use the -g/--git option to generate diffs in the git extended diff
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	1484 format. See :hg:`help diffs` for more information.
7307 56380212d630 help: commands supporting --git point to the gitdiffs topic (issue1352) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7303 diff changeset	1485
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1486 With the --switch-parent option, the diff will be against the
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1487 second parent. It can be useful to review a merge.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1488
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1489 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1490 """
10015 b5f352f33520 commands.export: accept -r option as revision specification Alexander Solovyov <piranha@piranha.org.ua> parents: 10014 diff changeset	1491 changesets += tuple(opts.get('rev', []))
610 4c02464cb9f0 check export options for changeset before running shaleh@speakeasy.net parents: 609 diff changeset	1492 if not changesets:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	1493 raise util.Abort(_("export requires at least one changeset"))
3707 67f44b825784 Removed unused ui parameter from revpair/revrange and fix its users. Thomas Arendsen Hein <thomas@intevation.de> parents: 3706 diff changeset	1494 revs = cmdutil.revrange(repo, changesets)
2873 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2870 diff changeset	1495 if len(revs) > 1:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2870 diff changeset	1496 ui.note(_('exporting patches:\n'))
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2870 diff changeset	1497 else:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2870 diff changeset	1498 ui.note(_('exporting patch:\n'))
10611 e764f24a45ee patch/diff: move patch.export() to cmdutil.export() Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10606 diff changeset	1499 cmdutil.export(repo, revs, template=opts.get('output'),
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1500 switch_parent=opts.get('switch_parent'),
2908 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2882 diff changeset	1501 opts=patch.diffopts(ui, opts))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1502
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1503 def forget(ui, repo, pats, *opts):
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1504 """forget the specified files on the next commit
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1505
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1506 Mark the specified files so they will no longer be tracked
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1507 after the next commit.
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1508
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1509 This only removes files from the current branch, not from the
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1510 entire project history, and it does not delete them from the
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1511 working directory.
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1512
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	1513 To undo a forget before the next commit, see :hg:`add`.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1514
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1515 Returns 0 on success.
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1516 """
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1517
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1518 if not pats:
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1519 raise util.Abort(_('no files specified'))
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1520
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1521 m = cmdutil.match(repo, pats, opts)
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1522 s = repo.status(match=m, clean=True)
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1523 forget = sorted(s[0] + s[1] + s[3] + s[6])
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1524 errs = 0
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1525
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1526 for f in m.files():
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1527 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1528 ui.warn(_('not removing %s: file is already untracked\n')
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1529 % m.rel(f))
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1530 errs = 1
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1531
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1532 for f in forget:
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1533 if ui.verbose or not m.exact(f):
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1534 ui.status(_('removing %s\n') % m.rel(f))
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1535
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	1536 repo[None].remove(forget, unlink=False)
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1537 return errs
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1538
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1539 def grep(ui, repo, pattern, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1540 """search for a pattern in specified files and revisions
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1541
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1542 Search revisions of files for a regular expression.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1543
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	1544 This command behaves differently than Unix grep. It only accepts
cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	1545 Python/Perl regexps. It searches repository history, not the
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1546 working directory. It always prints the revision number in which a
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1547 match appears.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1548
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1549 By default, grep only prints output for the first revision of a
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	1550 file in which it finds a match. To get it to print every revision
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1551 that contains a change in match status ("-" for a match that
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1552 becomes a non-match, or "+" for a non-match that becomes a match),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1553 use the --all flag.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1554
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1555 Returns 0 if a match is found, 1 otherwise.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1556 """
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1557 reflags = 0
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1558 if opts.get('ignore_case'):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1559 reflags \|= re.I
4877 242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4866 diff changeset	1560 try:
242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4866 diff changeset	1561 regexp = re.compile(pattern, reflags)
242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4866 diff changeset	1562 except Exception, inst:
6057 218d5b9aa466 Remove trailing ! from two error messages as this was confusing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6048 diff changeset	1563 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1564 return 1
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1565 sep, eol = ':', '\n'
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1566 if opts.get('print0'):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1567 sep = eol = '\0'
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1568
9097 431462bd8478 fix memory usage of revlog caches by limiting cache size [issue1639] Matt Mackall <mpm@selenic.com> parents: 8995 diff changeset	1569 getfile = util.lrucachefunc(repo.file)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1570
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1571 def matchlines(body):
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1572 begin = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1573 linenum = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1574 while True:
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1575 match = regexp.search(body, begin)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1576 if not match:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1577 break
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1578 mstart, mend = match.span()
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1579 linenum += body.count('\n', begin, mstart) + 1
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1580 lstart = body.rfind('\n', begin, mstart) + 1 or begin
7230 261a9f47b44b grep: avoid infinite loop when trailing newline is missing Matt Mackall <mpm@selenic.com> parents: 7228 diff changeset	1581 begin = body.find('\n', mend) + 1 or len(body)
261a9f47b44b grep: avoid infinite loop when trailing newline is missing Matt Mackall <mpm@selenic.com> parents: 7228 diff changeset	1582 lend = begin - 1
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1583 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1584
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	1585 class linestate(object):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1586 def __init__(self, line, linenum, colstart, colend):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1587 self.line = line
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1588 self.linenum = linenum
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1589 self.colstart = colstart
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1590 self.colend = colend
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1591
6465 fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6464 diff changeset	1592 def __hash__(self):
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6464 diff changeset	1593 return hash((self.linenum, self.line))
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6464 diff changeset	1594
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1595 def __eq__(self, other):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1596 return self.line == other.line
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1597
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1598 matches = {}
2869 8eaaf1321bfe grep: add --follow support. Brendan Cully <brendan@kublai.com> parents: 2868 diff changeset	1599 copies = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1600 def grepbody(fn, rev, body):
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1601 matches[rev].setdefault(fn, [])
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1602 m = matches[rev][fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1603 for lnum, cstart, cend, line in matchlines(body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1604 s = linestate(line, lnum, cstart, cend)
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1605 m.append(s)
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1606
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1607 def difflinestates(a, b):
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1608 sm = difflib.SequenceMatcher(None, a, b)
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1609 for tag, alo, ahi, blo, bhi in sm.get_opcodes():
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1610 if tag == 'insert':
3467 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3466 diff changeset	1611 for i in xrange(blo, bhi):
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1612 yield ('+', b[i])
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1613 elif tag == 'delete':
3467 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3466 diff changeset	1614 for i in xrange(alo, ahi):
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1615 yield ('-', a[i])
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1616 elif tag == 'replace':
3467 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3466 diff changeset	1617 for i in xrange(alo, ahi):
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1618 yield ('-', a[i])
3467 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3466 diff changeset	1619 for i in xrange(blo, bhi):
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1620 yield ('+', b[i])
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1621
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1622 def display(fn, ctx, pstates, states):
6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1623 rev = ctx.rev()
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	1624 datefunc = ui.quiet and util.shortdate or util.datestr
3951 cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1625 found = False
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1626 filerevmatches = {}
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1627 if opts.get('all'):
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1628 iter = difflinestates(pstates, states)
2868 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2842 diff changeset	1629 else:
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1630 iter = [('', l) for l in states]
3951 cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1631 for change, l in iter:
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1632 cols = [fn, str(rev)]
10816 635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1633 before, match, after = None, None, None
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1634 if opts.get('line_number'):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1635 cols.append(str(l.linenum))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1636 if opts.get('all'):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1637 cols.append(change)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1638 if opts.get('user'):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1639 cols.append(ui.shortuser(ctx.user()))
6133 779f2309d67a Add hg grep -d/--date to list the commit date of matched revisions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6106 diff changeset	1640 if opts.get('date'):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1641 cols.append(datefunc(ctx.date()))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1642 if opts.get('files_with_matches'):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1643 c = (fn, rev)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1644 if c in filerevmatches:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1645 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1646 filerevmatches[c] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1647 else:
10816 635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1648 before = l.line[:l.colstart]
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1649 match = l.line[l.colstart:l.colend]
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1650 after = l.line[l.colend:]
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1651 ui.write(sep.join(cols))
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1652 if before is not None:
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1653 ui.write(sep + before)
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1654 ui.write(match, label='grep.match')
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1655 ui.write(after)
635d601e8f21 grep: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10654 diff changeset	1656 ui.write(eol)
3951 cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1657 found = True
cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1658 return found
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1659
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1660 skip = {}
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1661 revfiles = {}
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9628 diff changeset	1662 matchfn = cmdutil.match(repo, pats, opts)
3951 cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1663 found = False
2869 8eaaf1321bfe grep: add --follow support. Brendan Cully <brendan@kublai.com> parents: 2868 diff changeset	1664 follow = opts.get('follow')
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1665
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1666 def prep(ctx, fns):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1667 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1668 pctx = ctx.parents()[0]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1669 parent = pctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1670 matches.setdefault(rev, {})
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1671 matches.setdefault(parent, {})
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1672 files = revfiles.setdefault(rev, [])
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1673 for fn in fns:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1674 flog = getfile(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1675 try:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1676 fnode = ctx.filenode(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1677 except error.LookupError:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1678 continue
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1679
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1680 copied = flog.renamed(fnode)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1681 copy = follow and copied and copied[0]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1682 if copy:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1683 copies.setdefault(rev, {})[fn] = copy
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1684 if fn in skip:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1685 if copy:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1686 skip[copy] = True
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1687 continue
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1688 files.append(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1689
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1690 if fn not in matches[rev]:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1691 grepbody(fn, rev, flog.read(fnode))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1692
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1693 pfn = copy or fn
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1694 if pfn not in matches[parent]:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1695 try:
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1696 fnode = pctx.filenode(pfn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1697 grepbody(pfn, parent, flog.read(fnode))
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7632 diff changeset	1698 except error.LookupError:
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1699 pass
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1700
9666 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	1701 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1702 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1703 parent = ctx.parents()[0].rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1704 for fn in sorted(revfiles.get(rev, [])):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1705 states = matches[rev][fn]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1706 copy = copies.get(rev, {}).get(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1707 if fn in skip:
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1708 if copy:
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1709 skip[copy] = True
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1710 continue
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1711 pstates = matches.get(parent, {}).get(copy or fn, [])
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1712 if pstates or states:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1713 r = display(fn, ctx, pstates, states)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1714 found = found or r
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1715 if r and not opts.get('all'):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1716 skip[fn] = True
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1717 if copy:
80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1718 skip[copy] = True
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1719 del matches[rev]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1720 del revfiles[rev]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1721
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1722 return not found
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1723
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1724 def heads(ui, repo, branchrevs, *opts):
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1725 """show current repository heads or show branch heads
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1726
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1727 With no arguments, show all repository branch heads.
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1728
9503 8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1729 Repository "heads" are changesets with no child changesets. They are
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1730 where development generally takes place and are the usual targets
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1731 for update and merge operations. Branch heads are changesets that have
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1732 no child changeset on the same branch.
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1733
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1734 If one or more REVs are given, only branch heads on the branches
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1735 associated with the specified changesets are shown.
9503 8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1736
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1737 If -c/--closed is specified, also show branch heads marked closed
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	1738 (see :hg:`commit --close-branch`).
9503 8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1739
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1740 If STARTREV is specified, only those heads that are descendants of
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9215 diff changeset	1741 STARTREV will be displayed.
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1742
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1743 If -t/--topo is specified, named branch mechanics will be ignored and only
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1744 changesets without children will be shown.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1745
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1746 Returns 0 if matching heads are found, 1 if not.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1747 """
10328 0798a3d5f812 commands: simplify heads a little bit before I start hacking it up Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10326 diff changeset	1748
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1749 if opts.get('rev'):
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1750 start = repo.lookup(opts['rev'])
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1751 else:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1752 start = None
10328 0798a3d5f812 commands: simplify heads a little bit before I start hacking it up Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10326 diff changeset	1753
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1754 if opts.get('topo'):
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1755 heads = [repo[h] for h in repo.heads(start)]
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1547 diff changeset	1756 else:
10348 0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1757 heads = []
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1758 for b, ls in repo.branchmap().iteritems():
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1759 if start is None:
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1760 heads += [repo[h] for h in ls]
10348 0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1761 continue
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1762 startrev = repo.changelog.rev(start)
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1763 descendants = set(repo.changelog.descendants(startrev))
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1764 descendants.add(startrev)
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1765 rev = repo.changelog.rev
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1766 heads += [repo[h] for h in ls if rev(h) in descendants]
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1767
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1768 if branchrevs:
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1769 decode, encode = encoding.fromlocal, encoding.tolocal
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1770 branches = set(repo[decode(br)].branch() for br in branchrevs)
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1771 heads = [h for h in heads if h.branch() in branches]
10328 0798a3d5f812 commands: simplify heads a little bit before I start hacking it up Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10326 diff changeset	1772
10349 20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1773 if not opts.get('closed'):
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1774 heads = [h for h in heads if not h.extra().get('close')]
10349 20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1775
20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1776 if opts.get('active') and branchrevs:
20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1777 dagheads = repo.heads(start)
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1778 heads = [h for h in heads if h.node() in dagheads]
10349 20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1779
20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1780 if branchrevs:
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1781 haveheads = set(h.branch() for h in heads)
10346 e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1782 if branches - haveheads:
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1783 headless = ', '.join(encode(b) for b in branches - haveheads)
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1784 msg = _('no open branch heads found on branches %s')
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1785 if opts.get('rev'):
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1786 msg += _(' (started at %s)' % opts['rev'])
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1787 ui.warn((msg + '\n') % headless)
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1788
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1789 if not heads:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1790 return 1
10328 0798a3d5f812 commands: simplify heads a little bit before I start hacking it up Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10326 diff changeset	1791
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1792 heads = sorted(heads, key=lambda x: -x.rev())
3646 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3634 diff changeset	1793 displayer = cmdutil.show_changeset(ui, repo, opts)
10331 ec5240a22f4a commands: always order heads recent to oldest Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10330 diff changeset	1794 for ctx in heads:
ec5240a22f4a commands: always order heads recent to oldest Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10330 diff changeset	1795 displayer.show(ctx)
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1796 displayer.close()
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1797
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1798 def help_(ui, name=None, with_version=False, unknowncmd=False):
7210 833d1250ce00 help: update help Matt Mackall <mpm@selenic.com> parents: 7197 diff changeset	1799 """show help for a given topic or a help overview
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1800
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1801 With no arguments, print a list of commands with short help messages.
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1802
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1803 Given a topic, extension, or command name, print help for that
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1804 topic.
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1805
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1806 Returns 0 if successful.
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	1807 """
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1808 option_lists = []
9142 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	1809 textwidth = util.termwidth() - 2
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1810
4315 bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1811 def addglobalopts(aliases):
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1812 if ui.verbose:
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1813 option_lists.append((_("global options:"), globalopts))
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1814 if name == 'shortlist':
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1815 option_lists.append((_('use "hg help" for the full list '
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1816 'of commands'), ()))
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1817 else:
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1818 if name == 'shortlist':
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1819 msg = _('use "hg help" for the full list of commands '
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1820 'or "hg -v" for details')
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1821 elif aliases:
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1822 msg = _('use "hg -v help%s" to show aliases and '
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1823 'global options') % (name and " " + name or "")
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1824 else:
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1825 msg = _('use "hg -v help %s" to show global options') % name
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1826 option_lists.append((msg, ()))
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1827
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1828 def helpcmd(name):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1829 if with_version:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1830 version_(ui)
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1831 ui.write('\n')
6650 ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6638 diff changeset	1832
ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6638 diff changeset	1833 try:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1834 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1835 except error.AmbiguousCommand, inst:
9035 8e34f363dd77 compat: don't reference an exception var inside a lambda Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	1836 # py3k fix: except vars can't be used outside the scope of the
8e34f363dd77 compat: don't reference an exception var inside a lambda Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	1837 # except block, nor can be used inside a lambda. python issue4617
8e34f363dd77 compat: don't reference an exception var inside a lambda Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	1838 prefix = inst.args[0]
8e34f363dd77 compat: don't reference an exception var inside a lambda Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	1839 select = lambda c: c.lstrip('^').startswith(prefix)
6650 ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6638 diff changeset	1840 helplist(_('list of commands:\n\n'), select)
ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6638 diff changeset	1841 return
ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6638 diff changeset	1842
10021 0022f5c5459e help: don't display bogus help messages for invalid aliases Brodie Rao <me+hg@dackz.net> parents: 10015 diff changeset	1843 # check if it's an invalid alias and display its error if it is
0022f5c5459e help: don't display bogus help messages for invalid aliases Brodie Rao <me+hg@dackz.net> parents: 10015 diff changeset	1844 if getattr(entry[0], 'badalias', False):
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1845 if not unknowncmd:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1846 entry[0](ui)
10021 0022f5c5459e help: don't display bogus help messages for invalid aliases Brodie Rao <me+hg@dackz.net> parents: 10015 diff changeset	1847 return
0022f5c5459e help: don't display bogus help messages for invalid aliases Brodie Rao <me+hg@dackz.net> parents: 10015 diff changeset	1848
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1849 # synopsis
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1850 if len(entry) > 2:
cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1851 if entry[2].startswith('hg'):
cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1852 ui.write("%s\n" % entry[2])
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	1853 else:
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1854 ui.write('hg %s %s\n' % (aliases[0], entry[2]))
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	1855 else:
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	1856 ui.write('hg %s\n' % aliases[0])
5783 28d9f8cd02f2 Move aliases section in help below synopsis (issue362) Thomas Arendsen Hein <thomas@intevation.de> parents: 5781 diff changeset	1857
28d9f8cd02f2 Move aliases section in help below synopsis (issue362) Thomas Arendsen Hein <thomas@intevation.de> parents: 5781 diff changeset	1858 # aliases
28d9f8cd02f2 Move aliases section in help below synopsis (issue362) Thomas Arendsen Hein <thomas@intevation.de> parents: 5781 diff changeset	1859 if not ui.quiet and len(aliases) > 1:
28d9f8cd02f2 Move aliases section in help below synopsis (issue362) Thomas Arendsen Hein <thomas@intevation.de> parents: 5781 diff changeset	1860 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1861
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1862 # description
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1863 doc = gettext(entry[0].__doc__)
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1864 if not doc:
7595 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7593 diff changeset	1865 doc = _("(no help text available)")
10564 6ded6243bde2 alias: fixes exception when displaying translated help text Yuya Nishihara <yuya@tcha.org> parents: 10559 diff changeset	1866 if hasattr(entry[0], 'definition'): # aliased command
6ded6243bde2 alias: fixes exception when displaying translated help text Yuya Nishihara <yuya@tcha.org> parents: 10559 diff changeset	1867 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1868 if ui.quiet:
9123 31177742f54a for calls expecting bool args, pass bool instead of int Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9102 diff changeset	1869 doc = doc.splitlines()[0]
10445 8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1870 keep = ui.verbose and ['verbose'] or []
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1871 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1872 ui.write("\n%s\n" % formatted)
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1873 if pruned:
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1874 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1875
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1876 if not ui.quiet:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1877 # options
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1878 if entry[1]:
cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1879 option_lists.append((_("options:\n"), entry[1]))
4315 bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1880
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1881 addglobalopts(False)
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1882
4932 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	1883 def helplist(header, select=None):
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1884 h = {}
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1885 cmds = {}
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7595 diff changeset	1886 for c, e in table.iteritems():
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1887 f = c.split("\|", 1)[0]
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1888 if select and not select(f):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1889 continue
7197 f60730693efc help: show extension commands in short list, separate extension list in help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7196 diff changeset	1890 if (not select and name != 'shortlist' and
f60730693efc help: show extension commands in short list, separate extension list in help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7196 diff changeset	1891 e[0].__module__ != __name__):
7126 111813de4188 remove extension commands from global help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7125 diff changeset	1892 continue
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1893 if name == "shortlist" and not f.startswith("^"):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1894 continue
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1895 f = f.lstrip("^")
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1896 if not ui.debugflag and f.startswith("debug"):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1897 continue
9136 98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1898 doc = e[0].__doc__
98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1899 if doc and 'DEPRECATED' in doc and not ui.verbose:
98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1900 continue
98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1901 doc = gettext(doc)
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1902 if not doc:
7595 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7593 diff changeset	1903 doc = _("(no help text available)")
9123 31177742f54a for calls expecting bool args, pass bool instead of int Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9102 diff changeset	1904 h[f] = doc.splitlines()[0].rstrip()
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1905 cmds[f] = c.lstrip("^")
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1906
4932 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	1907 if not h:
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	1908 ui.status(_('no commands defined\n'))
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	1909 return
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	1910
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	1911 ui.status(header)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	1912 fns = sorted(h)
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1913 m = max(map(len, fns))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1914 for f in fns:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1915 if ui.verbose:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1916 commands = cmds[f].replace("\|",", ")
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1917 ui.write(" %s:\n %s\n"%(commands, h[f]))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1918 else:
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	1919 ui.write('%s\n' % (util.wrap(h[f],
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	1920 initindent=' %-*s ' % (m, f),
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	1921 hangindent=' ' * (m + 4))))
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1922
4315 bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1923 if not ui.quiet:
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1924 addglobalopts(True)
bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	1925
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1926 def helptopic(name):
7012 78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1927 for names, header, doc in help.helptable:
78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1928 if name in names:
78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1929 break
78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1930 else:
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1931 raise error.UnknownCommand(name)
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1932
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1933 # description
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1934 if not doc:
7595 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7593 diff changeset	1935 doc = _("(no help text available)")
8366 0bf0045000b5 some modernization cleanups, forward compatibility Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8313 diff changeset	1936 if hasattr(doc, '__call__'):
3799 58133ba5847d Allow topics to be callables Matt Mackall <mpm@selenic.com> parents: 3798 diff changeset	1937 doc = doc()
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1938
9142 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	1939 ui.write("%s\n\n" % header)
9530 cad36e496640 help: un-indent help topics Martin Geisler <mg@lazybytes.net> parents: 9527 diff changeset	1940 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1941
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1942 def helpext(name):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1943 try:
4544 930ed513c864 Create a separate module for managing extensions Matt Mackall <mpm@selenic.com> parents: 4543 diff changeset	1944 mod = extensions.find(name)
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1945 doc = gettext(mod.__doc__) or _('no help text available')
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1946 except KeyError:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1947 mod = None
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1948 doc = extensions.disabledext(name)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1949 if not doc:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1950 raise error.UnknownCommand(name)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1951
9269 b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9237 diff changeset	1952 if '\n' not in doc:
b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9237 diff changeset	1953 head, tail = doc, ""
b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9237 diff changeset	1954 else:
b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9237 diff changeset	1955 head, tail = doc.split('\n', 1)
9142 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	1956 ui.write(_('%s extension - %s\n\n') % (name.split('.')[-1], head))
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	1957 if tail:
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	1958 ui.write(minirst.format(tail, textwidth))
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	1959 ui.status('\n\n')
4009 86098ec4b77a fix hg help <ext> for extension that do not define any command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3914 diff changeset	1960
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1961 if mod:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1962 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1963 ct = mod.cmdtable
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1964 except AttributeError:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1965 ct = {}
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1966 modcmds = set([c.split('\|', 1)[0] for c in ct])
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1967 helplist(_('list of commands:\n\n'), modcmds.__contains__)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1968 else:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1969 ui.write(_('use "hg help extensions" for information on enabling '
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1970 'extensions\n'))
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1971
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1972 def helpextcmd(name):
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1973 cmd, ext, mod = extensions.disabledcmd(name, ui.config('ui', 'strict'))
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1974 doc = gettext(mod.__doc__).splitlines()[0]
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1975
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1976 msg = help.listexts(_("'%s' is provided by the following "
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1977 "extension:") % cmd, {ext: doc}, len(ext),
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1978 indent=4)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1979 ui.write(minirst.format(msg, textwidth))
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1980 ui.write('\n\n')
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1981 ui.write(_('use "hg help extensions" for information on enabling '
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1982 'extensions\n'))
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1983
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1984 if name and name != 'shortlist':
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1985 i = None
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1986 if unknowncmd:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1987 queries = (helpextcmd,)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1988 else:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1989 queries = (helptopic, helpcmd, helpext, helpextcmd)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1990 for f in queries:
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1991 try:
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1992 f(name)
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1993 i = None
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1994 break
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1995 except error.UnknownCommand, inst:
3798 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1996 i = inst
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1997 if i:
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3787 diff changeset	1998 raise i
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	1999
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2000 else:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2001 # program name
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2002 if ui.verbose or with_version:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2003 version_(ui)
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2004 else:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2005 ui.status(_("Mercurial Distributed SCM\n"))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2006 ui.status('\n')
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2007
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2008 # list of commands
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2009 if name == "shortlist":
4932 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	2010 header = _('basic commands:\n\n')
4315 bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	2011 else:
4932 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	2012 header = _('list of commands:\n\n')
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	2013
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4924 diff changeset	2014 helplist(header)
9839 0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	2015 if name != 'shortlist':
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	2016 exts, maxlength = extensions.enabled()
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	2017 text = help.listexts(_('enabled extensions:'), exts, maxlength)
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	2018 if text:
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	2019 ui.write("\n%s\n" % minirst.format(text, textwidth))
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2020
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2021 # list all option lists
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2022 opt_output = []
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2023 multioccur = False
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2024 for title, options in option_lists:
4315 bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	2025 opt_output.append(("\n%s" % title, None))
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2026 for option in options:
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2027 if len(option) == 5:
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2028 shortopt, longopt, default, desc, optlabel = option
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2029 else:
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2030 shortopt, longopt, default, desc = option
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2031 optlabel = _("VALUE") # default label
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2032
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2033 if _("DEPRECATED") in desc and not ui.verbose:
10338 23e608f42f2c fix spaces/identation issues Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10331 diff changeset	2034 continue
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2035 if isinstance(default, list):
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2036 numqualifier = " %s [+]" % optlabel
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2037 multioccur = True
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2038 elif (default is not None) and not isinstance(default, bool):
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2039 numqualifier = " %s" % optlabel
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2040 else:
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2041 numqualifier = ""
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2042 opt_output.append(("%2s%s" %
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2043 (shortopt and "-%s" % shortopt,
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2044 longopt and " --%s%s" %
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2045 (longopt, numqualifier)),
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2046 "%s%s" % (desc,
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2047 default
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2048 and _(" (default: %s)") % default
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2049 or "")))
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2050 if multioccur:
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2051 msg = _("\n[+] marked option can be specified multiple times")
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2052 if ui.verbose and name != 'shortlist':
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2053 opt_output.append((msg, ()))
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2054 else:
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	2055 opt_output.insert(-1, (msg, ()))
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2056
7196 3f6a4f1de43f help: show help topics by default in 'hg help', with longest available id Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7185 diff changeset	2057 if not name:
7210 833d1250ce00 help: update help Matt Mackall <mpm@selenic.com> parents: 7197 diff changeset	2058 ui.write(_("\nadditional help topics:\n\n"))
6651 a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6650 diff changeset	2059 topics = []
7012 78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	2060 for names, header, doc in help.helptable:
9527 460e410c39be commands: simpler sort of help topic names Martin Geisler <mg@lazybytes.net> parents: 9509 diff changeset	2061 topics.append((sorted(names, key=len, reverse=True)[0], header))
6651 a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6650 diff changeset	2062 topics_len = max([len(s[0]) for s in topics])
a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6650 diff changeset	2063 for t, desc in topics:
a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6650 diff changeset	2064 ui.write(" %-*s %s\n" % (topics_len, t, desc))
a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6650 diff changeset	2065
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2066 if opt_output:
4315 bc6f5a1d8b7b Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4273 diff changeset	2067 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2068 for first, second in opt_output:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2069 if second:
11297 d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	2070 initindent = ' %-*s ' % (opts_len, first)
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	2071 hangindent = ' ' * (opts_len + 3)
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	2072 ui.write('%s\n' % (util.wrap(second,
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	2073 initindent=initindent,
d320e70442a5 replace Python standard textwrap by MBCS sensitive one for i18n text FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11276 diff changeset	2074 hangindent=hangindent)))
3662 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2075 else:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	2076 ui.write("%s\n" % first)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	2077
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	2078 def identify(ui, repo, source=None,
150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	2079 rev=None, num=None, id=None, branch=None, tags=None):
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	2080 """identify the working copy or specified revision
091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	2081
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2082 With no revision, print a summary of the current state of the
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	2083 repository.
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	2084
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2085 Specifying a path to a repository root or Mercurial bundle will
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2086 cause lookup to operate on that repository/bundle.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2087
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2088 This summary identifies the repository state using one or two
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2089 parent hash identifiers, followed by a "+" if there are
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2090 uncommitted changes in the working directory, a list of tags for
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2091 this revision and a branch name for non-default branches.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2092
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2093 Returns 0 if successful.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2094 """
4662 f9b8ea362b49 identify: show nullid for empty repo Matt Mackall <mpm@selenic.com> parents: 4659 diff changeset	2095
5330 4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	2096 if not repo and not source:
4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	2097 raise util.Abort(_("There is no Mercurial repository here "
4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	2098 "(.hg not found)"))
4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	2099
2973 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2963 diff changeset	2100 hexfunc = ui.debugflag and hex or short
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2101 default = not (num or id or branch or tags)
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2102 output = []
4664 dedb8abfd0e1 identify: use contexts Matt Mackall <mpm@selenic.com> parents: 4662 diff changeset	2103
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	2104 revs = []
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	2105 if source:
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2106 source, branches = hg.parseurl(ui.expandpath(source))
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	2107 repo = hg.repository(ui, source)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2108 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	2109
af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	2110 if not repo.local():
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	2111 if not rev and revs:
150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	2112 rev = revs[0]
4667 c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	2113 if not rev:
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	2114 rev = "tip"
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	2115 if num or branch or tags:
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	2116 raise util.Abort(
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	2117 "can't query remote revision number, branch, or tags")
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	2118 output = [hexfunc(repo.lookup(rev))]
4667 c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	2119 elif not rev:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2120 ctx = repo[None]
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	2121 parents = ctx.parents()
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2122 changed = False
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2123 if default or id or num:
10515 98bc3e195720 identify: don't include unknown in status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10505 diff changeset	2124 changed = util.any(repo.status())
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2125 if default or id:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2126 output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2127 (changed) and "+" or "")]
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2128 if num:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2129 output.append("%s%s" % ('+'.join([str(p.rev()) for p in parents]),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2130 (changed) and "+" or ""))
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	2131 else:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2132 ctx = repo[rev]
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2133 if default or id:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2134 output = [hexfunc(ctx.node())]
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2135 if num:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2136 output.append(str(ctx.rev()))
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2137
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	2138 if repo.local() and default and not ui.quiet:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	2139 b = encoding.tolocal(ctx.branch())
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2140 if b != 'default':
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2141 output.append("(%s)" % b)
3430 9a6491770b04 Report branch for hg id Matt Mackall <mpm@selenic.com> parents: 3429 diff changeset	2142
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	2143 # multiple tags for a single parent separated by '/'
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2144 t = "/".join(ctx.tags())
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2145 if t:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2146 output.append(t)
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2147
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2148 if branch:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	2149 output.append(encoding.tolocal(ctx.branch()))
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2150
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2151 if tags:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	2152 output.extend(ctx.tags())
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	2153
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	2154 ui.write("%s\n" % ' '.join(output))
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	2155
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	2156 def import_(ui, repo, patch1, patches, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2157 """import an ordered set of patches
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2158
9649 20b91f91f9ca minor documentation improvements timeless@mozdev.org parents: 9646 diff changeset	2159 Import a list of patches and commit them individually (unless
20b91f91f9ca minor documentation improvements timeless@mozdev.org parents: 9646 diff changeset	2160 --no-commit is specified).
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2161
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2162 If there are outstanding changes in the working directory, import
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2163 will abort unless given the -f/--force flag.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2164
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	2165 You can import a patch straight from a mail message. Even patches
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2166 as attachments work (to use the body part, it must have type
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2167 text/plain or text/x-patch). From and Subject headers of email
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	2168 message are used as default committer and commit message. All
2515 a6700c222314 import: make help clearer. suggested by asak. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2513 diff changeset	2169 text/plain body parts before first diff are added to commit
a6700c222314 import: make help clearer. suggested by asak. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2513 diff changeset	2170 message.
2504 158d3d2ae070 import: parse email messages Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	2171
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2172 If the imported patch was generated by :hg:`export`, user and
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2173 description from patch override values from message headers and
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2174 body. Values given on command line with -m/--message and -u/--user
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2175 override these.
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2176
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2177 If --exact is specified, import will set the working directory to
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2178 the parent of each patch before applying it, and will abort if the
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2179 resulting changeset has a different ID than the one recorded in
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2180 the patch. This may happen due to character set problems or other
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2181 deficiencies in the text patch format.
4258 47ba52121433 Add import --exact. Brendan Cully <brendan@kublai.com> parents: 4256 diff changeset	2182
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2183 With -s/--similarity, hg will attempt to discover renames and
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2184 copies in the patch in the same way as 'addremove'.
7400 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2185
8931 4c99eafb101e commands: add note about import retrieving patches from URLs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8927 diff changeset	2186 To read a patch from standard input, use "-" as the patch name. If
4c99eafb101e commands: add note about import retrieving patches from URLs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8927 diff changeset	2187 a URL is specified, the patch will be downloaded from it.
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	2188 See :hg:`help dates` for a list of formats valid for -d/--date.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2189
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2190 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2191 """
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	2192 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	2193
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	2194 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	2195 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	2196 opts['date'] = util.parsedate(date)
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	2197
7400 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2198 try:
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2199 sim = float(opts.get('similarity') or 0)
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2200 except ValueError:
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2201 raise util.Abort(_('similarity must be a number'))
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2202 if sim < 0 or sim > 100:
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2203 raise util.Abort(_('similarity must be between 0 and 100'))
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	2204
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2205 if opts.get('exact') or not opts.get('force'):
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	2206 cmdutil.bail_if_changed(repo)
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	2207
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	2208 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	2209 strip = opts["strip"]
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2210 wlock = lock = None
10384 832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2211
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2212 def tryone(ui, hunk):
10413 e433002acb05 fix up a bunch of check-code warnings Matt Mackall <mpm@selenic.com> parents: 10405 diff changeset	2213 tmpname, message, user, date, branch, nodeid, p1, p2 = \
e433002acb05 fix up a bunch of check-code warnings Matt Mackall <mpm@selenic.com> parents: 10405 diff changeset	2214 patch.extract(ui, hunk)
10384 832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2215
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2216 if not tmpname:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2217 return None
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2218 commitid = _('to working directory')
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2219
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2220 try:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2221 cmdline_message = cmdutil.logmessage(opts)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2222 if cmdline_message:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2223 # pickup the cmdline msg
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2224 message = cmdline_message
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2225 elif message:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2226 # pickup the patch msg
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2227 message = message.strip()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2228 else:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2229 # launch the editor
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2230 message = None
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2231 ui.debug('message:\n%s\n' % message)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2232
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2233 wp = repo.parents()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2234 if opts.get('exact'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2235 if not nodeid or not p1:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2236 raise util.Abort(_('not a Mercurial patch'))
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2237 p1 = repo.lookup(p1)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2238 p2 = repo.lookup(p2 or hex(nullid))
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2239
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2240 if p1 != wp[0].node():
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2241 hg.clean(repo, p1)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2242 repo.dirstate.setparents(p1, p2)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2243 elif p2:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2244 try:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2245 p1 = repo.lookup(p1)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2246 p2 = repo.lookup(p2)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2247 if p1 == wp[0].node():
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2248 repo.dirstate.setparents(p1, p2)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2249 except error.RepoError:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2250 pass
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2251 if opts.get('exact') or opts.get('import_branch'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2252 repo.dirstate.setbranch(branch or 'default')
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2253
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2254 files = {}
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2255 try:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2256 patch.patch(tmpname, ui, strip=strip, cwd=repo.root,
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2257 files=files, eolmode=None)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2258 finally:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2259 files = patch.updatedir(ui, repo, files,
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2260 similarity=sim / 100.0)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2261 if not opts.get('no_commit'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2262 if opts.get('exact'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2263 m = None
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2264 else:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2265 m = cmdutil.matchfiles(repo, files or [])
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2266 n = repo.commit(message, opts.get('user') or user,
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2267 opts.get('date') or date, match=m,
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2268 editor=cmdutil.commiteditor)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2269 if opts.get('exact'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2270 if hex(n) != nodeid:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2271 repo.rollback()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2272 raise util.Abort(_('patch is damaged'
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2273 ' or loses information'))
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2274 # Force a dirstate write so that the next transaction
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2275 # backups an up-do-date file.
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2276 repo.dirstate.write()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2277 if n:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2278 commitid = short(n)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2279
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2280 return commitid
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2281 finally:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2282 os.unlink(tmpname)
10405 2d30d66a89ad whitespace cleanup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10394 diff changeset	2283
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2284 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2285 wlock = repo.wlock()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2286 lock = repo.lock()
10384 832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2287 lastcommit = None
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2288 for p in patches:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2289 pf = os.path.join(d, p)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2290
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2291 if pf == '-':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2292 ui.status(_("applying patch from stdin\n"))
7271 8046f0a070a6 use our urlopener (proxy handling, etc) instead of urllib Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7270 diff changeset	2293 pf = sys.stdin
2400 2e90024e1471 import: allow to import stdin with file name "-" Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2397 diff changeset	2294 else:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2295 ui.status(_("applying %s\n") % p)
7271 8046f0a070a6 use our urlopener (proxy handling, etc) instead of urllib Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7270 diff changeset	2296 pf = url.open(ui, pf)
10384 832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2297
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2298 haspatch = False
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2299 for hunk in patch.split(pf):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2300 commitid = tryone(ui, hunk)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2301 if commitid:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2302 haspatch = True
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2303 if lastcommit:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2304 ui.status(_('applied %s\n') % lastcommit)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2305 lastcommit = commitid
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2306
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10378 diff changeset	2307 if not haspatch:
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2308 raise util.Abort(_('no diffs found'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2309
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2310 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	2311 release(lock, wlock)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	2312
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	2313 def incoming(ui, repo, source="default", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2314 """show new changesets found in source
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2315
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2316 Show new changesets found in the specified path/URL or the default
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2317 pull location. These are the changesets that would have been pulled
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2318 if a pull at the time you issued this command.
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2319
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2320 For remote repository, using --bundle avoids downloading the
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2321 changesets twice if the incoming is followed by a pull.
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2322
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2323 See pull for valid source format details.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2324
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2325 Returns 0 if there are incoming changes, 1 otherwise.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2326 """
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2327 limit = cmdutil.loglimit(opts)
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2328 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	2329 other = hg.repository(hg.remoteui(repo, opts), source)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2330 ui.status(_('comparing with %s\n') % url.hidepassword(source))
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2331 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2332 if revs:
5255 65dc707606ed Push capability checking into protocol-level code. Bryan O'Sullivan <bos@serpentine.com> parents: 5241 diff changeset	2333 revs = [other.lookup(rev) for rev in revs]
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	2334
3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	2335 tmp = discovery.findcommonincoming(repo, other, heads=revs,
3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	2336 force=opts.get('force'))
3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	2337 common, incoming, rheads = tmp
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2338 if not incoming:
3940 7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	2339 try:
7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	2340 os.unlink(opts["bundle"])
7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	2341 except:
7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	2342 pass
1993 fb6ca9801d04 show message if no changes found on incoming TK Soh <teekaysoh@yahoo.com> parents: 1981 diff changeset	2343 ui.status(_("no changes found\n"))
3931 f2cbcf1e98b2 incoming/outgoing: return failure if no changes found Matt Mackall <mpm@selenic.com> parents: 3930 diff changeset	2344 return 1
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2345
fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2346 cleanup = None
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2347 try:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2348 fname = opts["bundle"]
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2349 if fname or not other.local():
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2350 # create a bundle (uncompressed if other repo is not local)
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	2351
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	2352 if revs is None and other.capable('changegroupsubset'):
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	2353 revs = rheads
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	2354
4473 671158f060cc Make "hg incoming -r revision_number" work for remote repos (issue566) Thomas Arendsen Hein <thomas@intevation.de> parents: 4324 diff changeset	2355 if revs is None:
671158f060cc Make "hg incoming -r revision_number" work for remote repos (issue566) Thomas Arendsen Hein <thomas@intevation.de> parents: 4324 diff changeset	2356 cg = other.changegroup(incoming, "incoming")
671158f060cc Make "hg incoming -r revision_number" work for remote repos (issue566) Thomas Arendsen Hein <thomas@intevation.de> parents: 4324 diff changeset	2357 else:
671158f060cc Make "hg incoming -r revision_number" work for remote repos (issue566) Thomas Arendsen Hein <thomas@intevation.de> parents: 4324 diff changeset	2358 cg = other.changegroupsubset(incoming, revs, 'incoming')
3706 0d810798acb1 Use 'bundletype' instead of 'type' to not shadow built-in function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3704 diff changeset	2359 bundletype = other.local() and "HG10BZ" or "HG10UN"
0d810798acb1 Use 'bundletype' instead of 'type' to not shadow built-in function. Thomas Arendsen Hein <thomas@intevation.de> parents: 3704 diff changeset	2360 fname = cleanup = changegroup.writebundle(cg, fname, bundletype)
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2361 # keep written bundle?
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2362 if opts["bundle"]:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2363 cleanup = None
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2364 if not other.local():
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2365 # use the created uncompressed bundlerepo
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2366 other = bundlerepo.bundlerepository(ui, repo.root, fname)
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2367
2521 9cceb439048b add -r/--rev arguments to incoming and outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2515 diff changeset	2368 o = other.changelog.nodesbetween(incoming, revs)[0]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2369 if opts.get('newest_first'):
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2370 o.reverse()
3646 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3634 diff changeset	2371 displayer = cmdutil.show_changeset(ui, other, opts)
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2372 count = 0
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2373 for n in o:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10060 diff changeset	2374 if limit is not None and count >= limit:
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2375 break
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2376 parents = [p for p in other.changelog.parents(n) if p != nullid]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2377 if opts.get('no_merges') and len(parents) == 2:
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2378 continue
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2379 count += 1
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7364 diff changeset	2380 displayer.show(other[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2381 displayer.close()
1974 0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2382 finally:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2383 if hasattr(other, 'close'):
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2384 other.close()
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2385 if cleanup:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	2386 os.unlink(cleanup)
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2387
2598 b898afee9d0d Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out. Thomas Arendsen Hein <thomas@intevation.de> parents: 2597 diff changeset	2388 def init(ui, dest=".", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2389 """create a new repository in the given directory
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2390
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	2391 Initialize a new repository in the given directory. If the given
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2392 directory does not exist, it will be created.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2393
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2394 If no directory is given, the current directory is used.
2590 911b56853fdd Additional information about URLs in pull/push/clone/init: Thomas Arendsen Hein <thomas@intevation.de> parents: 2589 diff changeset	2395
9970 36760956f6d3 commands: mark "ssh://" as inline literals in help texts Martin Geisler <mg@lazybytes.net> parents: 9952 diff changeset	2396 It is possible to specify an ``ssh://`` URL as the destination.
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	2397 See :hg:`help urls` for more information.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2398
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2399 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2400 """
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	2401 hg.repository(hg.remoteui(ui, opts), dest, create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	2402
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	2403 def locate(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2404 """locate files matching specific patterns
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2405
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2406 Print files under Mercurial control in the working directory whose
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2407 names match the given patterns.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2408
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2409 By default, this command searches all directories in the working
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2410 directory. To search just the current directory and its
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2411 subdirectories, use "--include .".
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2412
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2413 If no patterns are given to match, this command prints the names
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2414 of all files under Mercurial control in the working directory.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2415
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2416 If you want to feed the output of this command into the "xargs"
8032 4726a522a182 commands: use double quotes consistently in help texts Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	2417 command, use the -0 option to both this command and "xargs". This
4726a522a182 commands: use double quotes consistently in help texts Martin Geisler <mg@lazybytes.net> parents: 8031 diff changeset	2418 will avoid the problem of "xargs" treating single filenames that
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2419 contain whitespace as multiple filenames.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2420
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2421 Returns 0 if a match is found, 1 otherwise.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2422 """
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2423 end = opts.get('print0') and '\0' or '\n'
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	2424 rev = opts.get('rev') or None
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	2425
4191 1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	2426 ret = 1
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2427 m = cmdutil.match(repo, pats, opts, default='relglob')
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2428 m.bad = lambda x, y: False
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	2429 for abs in repo[rev].walk(m):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	2430 if not rev and abs not in repo.dirstate:
4305 a5cde03cd019 locate: don't print "file not found" messages. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4252 diff changeset	2431 continue
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2432 if opts.get('fullpath'):
7560 e05aa73ce2b7 use repo.wjoin(f) instead of os.path.join(repo.root, f) Martin Geisler <mg@daimi.au.dk> parents: 7538 diff changeset	2433 ui.write(repo.wjoin(abs), end)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	2434 else:
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	2435 ui.write(((pats and m.rel(abs)) or abs), end)
4191 1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	2436 ret = 0
1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	2437
1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4190 diff changeset	2438 return ret
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	2439
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	2440 def log(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2441 """show revision history of entire repository or files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2442
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2443 Print the revision history of the specified files or the entire
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2444 project.
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2445
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2446 File history is shown without following rename or copy history of
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	2447 files. Use -f/--follow with a filename to follow history across
0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	2448 renames and copies. --follow without a filename will only show
2779 12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2778 diff changeset	2449 ancestors or descendants of the starting revision. --follow-first
12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2778 diff changeset	2450 only follows the first parent of merge revisions.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2451
2778 2e0cd25fe4ac Make log --follow revision range start default to working dir parent. Brendan Cully <brendan@kublai.com> parents: 2777 diff changeset	2452 If no revision range is specified, the default is tip:0 unless
2e0cd25fe4ac Make log --follow revision range start default to working dir parent. Brendan Cully <brendan@kublai.com> parents: 2777 diff changeset	2453 --follow is set, in which case the working directory parent is
11384 c04084753990 commands: advertise "hg help revsets" in help for log Martin Geisler <mg@lazybytes.net> parents: 11371 diff changeset	2454 used as the starting revision. You can specify a revision set for
c04084753990 commands: advertise "hg help revsets" in help for log Martin Geisler <mg@lazybytes.net> parents: 11371 diff changeset	2455 log, see :hg:`help revsets` for more information.
2778 2e0cd25fe4ac Make log --follow revision range start default to working dir parent. Brendan Cully <brendan@kublai.com> parents: 2777 diff changeset	2456
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	2457 See :hg:`help dates` for a list of formats valid for -d/--date.
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	2458
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2459 By default this command prints revision number and changeset id,
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2460 tags, non-trivial parents, user, date and time, and a summary for
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2461 each commit. When the -v/--verbose switch is used, the list of
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2462 changed files and full commit message are shown.
3828 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	2463
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2464 NOTE: log -p/--patch may generate unexpected diff output for merge
7805 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	2465 changesets, as it will only compare the merge changeset against
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2466 its first parent. Also, only files different from BOTH parents
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2467 will appear in files:.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2468
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2469 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2470 """
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2471
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9628 diff changeset	2472 matchfn = cmdutil.match(repo, pats, opts)
6190 a79d9408806f Move finding/checking the log limit to cmdutil Thomas Arendsen Hein <thomas@intevation.de> parents: 6189 diff changeset	2473 limit = cmdutil.loglimit(opts)
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2474 count = 0
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2475
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2476 endrev = None
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2477 if opts.get('copies') and opts.get('rev'):
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2478 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
3190 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 3187 diff changeset	2479
3816 fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2480 df = False
fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2481 if opts["date"]:
fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2482 df = util.matchdate(opts["date"])
fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2483
10963 9e314c5e6890 log -b: use opts.get() instead of assuming opts is correctly filled Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10962 diff changeset	2484 branches = opts.get('branch', []) + opts.get('only_branch', [])
9e314c5e6890 log -b: use opts.get() instead of assuming opts is correctly filled Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10962 diff changeset	2485 opts['branch'] = [repo.lookupbranch(b) for b in branches]
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10934 diff changeset	2486
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3833 diff changeset	2487 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2488 def prep(ctx, fns):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	2489 rev = ctx.rev()
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2490 parents = [p for p in repo.changelog.parentrevs(rev)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2491 if p != nullrev]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2492 if opts.get('no_merges') and len(parents) == 2:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2493 return
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2494 if opts.get('only_merges') and len(parents) != 2:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2495 return
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10934 diff changeset	2496 if opts.get('branch') and ctx.branch() not in opts['branch']:
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2497 return
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2498 if df and not df(ctx.date()[0]):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2499 return
9664 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2500 if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2501 return
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2502 if opts.get('keyword'):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2503 for k in [kw.lower() for kw in opts['keyword']]:
9664 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2504 if (k in ctx.user().lower() or
4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2505 k in ctx.description().lower() or
4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2506 k in " ".join(ctx.files()).lower()):
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2507 break
9664 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2508 else:
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2509 return
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2510
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2511 copies = None
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2512 if opts.get('copies') and rev:
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2513 copies = []
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2514 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
9663 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2515 for fn in ctx.files():
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2516 rename = getrenamed(fn, rev)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2517 if rename:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2518 copies.append((fn, rename[0]))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2519
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2520 displayer.show(ctx, copies=copies)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2521
9666 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9664 diff changeset	2522 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
9687 c6da1cb3b255 log --limit: break after a limited number of csets (broken by f3d60543924f) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9679 diff changeset	2523 if count == limit:
c6da1cb3b255 log --limit: break after a limited number of csets (broken by f3d60543924f) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9679 diff changeset	2524 break
c6da1cb3b255 log --limit: break after a limited number of csets (broken by f3d60543924f) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9679 diff changeset	2525 if displayer.flush(ctx.rev()):
c6da1cb3b255 log --limit: break after a limited number of csets (broken by f3d60543924f) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9679 diff changeset	2526 count += 1
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2527 displayer.close()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2528
5138 13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2529 def manifest(ui, repo, node=None, rev=None):
3913 283ee8971570 doc string fix: hg cat and manifest default to current parent revision. Thomas Arendsen Hein <thomas@intevation.de> parents: 3900 diff changeset	2530 """output the current or given revision of the project manifest
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2531
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2532 Print a list of version controlled files for the given revision.
8041 87c5a4af0b5a Fix manifest default rev doc when no rev is checked out (issue1603) Patrick Mezard <pmezard@gmail.com> parents: 7850 diff changeset	2533 If no revision is given, the first parent of the working directory
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2534 is used, or the null revision if no revision is checked out.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2535
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2536 With -v, print file permissions, symlink and executable bits.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2537 With --debug, print file revision hashes.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2538
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2539 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2540 """
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2541
5138 13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2542 if rev and node:
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2543 raise util.Abort(_("please specify just one revision"))
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2544
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2545 if not node:
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2546 node = rev
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5124 diff changeset	2547
6751 51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	2548 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	2549 ctx = repo[node]
51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	2550 for f in ctx:
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2551 if ui.debugflag:
6751 51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	2552 ui.write("%40s " % hex(ctx.manifest()[f]))
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2553 if ui.verbose:
6751 51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6750 diff changeset	2554 ui.write(decor[ctx.flags(f)])
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2555 ui.write("%s\n" % f)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2556
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2557 def merge(ui, repo, node=None, **opts):
4014 509342f95564 various doc fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4013 diff changeset	2558 """merge working directory with another revision
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2559
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2560 The current working directory is updated with all changes made in
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2561 the requested revision since the last common predecessor revision.
7977 1cd3775e097c commands: better merge help text Martin Geisler <mg@daimi.au.dk> parents: 7976 diff changeset	2562
1cd3775e097c commands: better merge help text Martin Geisler <mg@daimi.au.dk> parents: 7976 diff changeset	2563 Files that changed between either parent are marked as changed for
1cd3775e097c commands: better merge help text Martin Geisler <mg@daimi.au.dk> parents: 7976 diff changeset	2564 the next commit and a commit must be performed before any further
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2565 updates to the repository are allowed. The next commit will have
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2566 two parents.
2903 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2896 diff changeset	2567
013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2896 diff changeset	2568 If no revision is specified, the working directory's parent is a
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2569 head revision, and the current branch contains exactly one other
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2570 head, the other head is merged with by default. Otherwise, an
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2571 explicit revision with which to merge with must be provided.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2572
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2573 Returns 0 on success, 1 if there are unresolved files.
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2574 """
2820 0bf22c109cc3 Factor doupdate into _lookup + hg.update Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	2575
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2576 if opts.get('rev') and node:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	2577 raise util.Abort(_("please specify just one revision"))
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	2578 if not node:
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2579 node = opts.get('rev')
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	2580
3885 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	2581 if not node:
6742 b148e9099133 use repo.changectx(None) to get a workingctx Matt Mackall <mpm@selenic.com> parents: 6741 diff changeset	2582 branch = repo.changectx(None).branch()
6844 a38dff85d31f merge: use correct branch name for counting heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6843 diff changeset	2583 bheads = repo.branchheads(branch)
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2584 if len(bheads) > 2:
11353 f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2585 raise util.Abort(_(
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2586 'branch \'%s\' has %d heads - '
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2587 'please merge with an explicit rev\n'
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2588 '(run \'hg heads .\' to see heads)')
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2589 % (branch, len(bheads)))
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2590
5224 9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5203 diff changeset	2591 parent = repo.dirstate.parents()[0]
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2592 if len(bheads) == 1:
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2593 if len(repo.heads()) > 1:
11353 f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2594 raise util.Abort(_(
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2595 'branch \'%s\' has one head - '
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2596 'please merge with an explicit rev\n'
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2597 '(run \'hg heads\' to see all heads)')
f2b25e8ea6c1 merge: when current branch has 1 or > 2 heads, actually abort. Greg Ward <greg-hg@gerg.ca> parents: 11342 diff changeset	2598 % branch)
5224 9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5203 diff changeset	2599 msg = _('there is nothing to merge')
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2600 if parent != repo.lookup(repo[None].branch()):
5547 253736bb0dc9 i18n: fix complaints from pygettext Matt Mackall <mpm@selenic.com> parents: 5525 diff changeset	2601 msg = _('%s - use "hg update" instead') % msg
5224 9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5203 diff changeset	2602 raise util.Abort(msg)
9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5203 diff changeset	2603
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2604 if parent not in bheads:
2903 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2896 diff changeset	2605 raise util.Abort(_('working dir not at a head rev - '
013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2896 diff changeset	2606 'use "hg update" or merge with an explicit rev'))
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2607 node = parent == bheads[0] and bheads[-1] or bheads[0]
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2608
8834 6d36fc70754e merge: rename -S/--show option to -P/--preview Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8815 diff changeset	2609 if opts.get('preview'):
10505 b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2610 # find nodes that are ancestors of p2 but not of p1
b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2611 p1 = repo.lookup('.')
b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2612 p2 = repo.lookup(node)
b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2613 nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2614
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2615 displayer = cmdutil.show_changeset(ui, repo, opts)
10505 b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2616 for node in nodes:
b3311e26f94f merge: fix --preview to show all nodes that will be merged (issue2043). Greg Ward <greg-hg@gerg.ca> parents: 10479 diff changeset	2617 displayer.show(repo[node])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2618 displayer.close()
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2619 return 0
50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2620
50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2621 return hg.merge(repo, node, force=opts.get('force'))
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2622
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2493 diff changeset	2623 def outgoing(ui, repo, dest=None, **opts):
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2624 """show changesets not found in the destination
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2625
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2626 Show changesets not found in the specified destination repository
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2627 or the default push location. These are the changesets that would
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2628 be pushed if a push was requested.
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2629
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2630 See pull for details of valid destination formats.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2631
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2632 Returns 0 if there are outgoing changes, 1 otherwise.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2633 """
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2634 limit = cmdutil.loglimit(opts)
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2635 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2636 dest, branches = hg.parseurl(dest, opts.get('branch'))
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2637 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2638 if revs:
b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2639 revs = [repo.lookup(rev) for rev in revs]
1965 62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2640
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	2641 other = hg.repository(hg.remoteui(repo, opts), dest)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2642 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	2643 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
1994 78ef83c9e9e1 show message if no changes found on outgoing Thomas Arendsen Hein <thomas@intevation.de> parents: 1993 diff changeset	2644 if not o:
78ef83c9e9e1 show message if no changes found on outgoing Thomas Arendsen Hein <thomas@intevation.de> parents: 1993 diff changeset	2645 ui.status(_("no changes found\n"))
3931 f2cbcf1e98b2 incoming/outgoing: return failure if no changes found Matt Mackall <mpm@selenic.com> parents: 3930 diff changeset	2646 return 1
2521 9cceb439048b add -r/--rev arguments to incoming and outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2515 diff changeset	2647 o = repo.changelog.nodesbetween(o, revs)[0]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2648 if opts.get('newest_first'):
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2649 o.reverse()
3646 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3634 diff changeset	2650 displayer = cmdutil.show_changeset(ui, repo, opts)
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2651 count = 0
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2652 for n in o:
10111 27457d31ae3f cmdutil: replace sys.maxint with None as default value in loglimit Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 10060 diff changeset	2653 if limit is not None and count >= limit:
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2654 break
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2655 parents = [p for p in repo.changelog.parents(n) if p != nullid]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2656 if opts.get('no_merges') and len(parents) == 2:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2657 continue
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2658 count += 1
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7364 diff changeset	2659 displayer.show(repo[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2660 displayer.close()
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2661
3665 d12c8668b102 remove legacy hg parents REV syntax Matt Mackall <mpm@selenic.com> parents: 3664 diff changeset	2662 def parents(ui, repo, file_=None, **opts):
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 8021 diff changeset	2663 """show the parents of the working directory or revision
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2664
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2665 Print the working directory's parent revisions. If a revision is
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2666 given via -r/--rev, the parent of that revision will be printed.
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2667 If a file argument is given, the revision in which the file was
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2668 last changed (before the working directory revision or the
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2669 argument to --rev if given) is printed.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2670
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2671 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2672 """
3665 d12c8668b102 remove legacy hg parents REV syntax Matt Mackall <mpm@selenic.com> parents: 3664 diff changeset	2673 rev = opts.get('rev')
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2674 if rev:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2675 ctx = repo[rev]
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2676 else:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2677 ctx = repo[None]
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2678
4586 1fcc076fcb17 Make parents with a file but not a revision use working directory revision. Brendan Cully <brendan@kublai.com> parents: 4473 diff changeset	2679 if file_:
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2680 m = cmdutil.match(repo, (file_,), opts)
5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2681 if m.anypats() or len(m.files()) != 1:
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	2682 raise util.Abort(_('can only specify an explicit filename'))
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2683 file_ = m.files()[0]
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2684 filenodes = []
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2685 for cp in ctx.parents():
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2686 if not cp:
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2687 continue
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2688 try:
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2689 filenodes.append(cp.filenode(file_))
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7632 diff changeset	2690 except error.LookupError:
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2691 pass
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2692 if not filenodes:
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2693 raise util.Abort(_("'%s' not found in manifest!") % file_)
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2694 fl = repo.file(file_)
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	2695 p = [repo.lookup(fl.linkrev(fl.rev(fn))) for fn in filenodes]
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2696 else:
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5262 diff changeset	2697 p = [cp.node() for cp in ctx.parents()]
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2698
3646 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3634 diff changeset	2699 displayer = cmdutil.show_changeset(ui, repo, opts)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2700 for n in p:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2701 if n != nullid:
7743 ec9b726a9428 commands: fix paths command docstring indention Martin Geisler <mg@daimi.au.dk> parents: 7739 diff changeset	2702 displayer.show(repo[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2703 displayer.close()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2704
1858 9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	2705 def paths(ui, repo, search=None):
7691 bcdc2fe3fd07 Clarified 'hg paths' command help Bill Barry <after.fallout@gmail.com> parents: 7684 diff changeset	2706 """show aliases for remote repositories
bcdc2fe3fd07 Clarified 'hg paths' command help Bill Barry <after.fallout@gmail.com> parents: 7684 diff changeset	2707
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2708 Show definition of symbolic path name NAME. If no name is given,
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2709 show definition of all available names.
7743 ec9b726a9428 commands: fix paths command docstring indention Martin Geisler <mg@daimi.au.dk> parents: 7739 diff changeset	2710
11009 4d3288197717 commands: better markup in "hg help paths" Martin Geisler <mg@lazybytes.net> parents: 11008 diff changeset	2711 Path names are defined in the [paths] section of
4d3288197717 commands: better markup in "hg help paths" Martin Geisler <mg@lazybytes.net> parents: 11008 diff changeset	2712 ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a
4d3288197717 commands: better markup in "hg help paths" Martin Geisler <mg@lazybytes.net> parents: 11008 diff changeset	2713 repository, ``.hg/hgrc`` is used, too.
7693 e040f9d6b2f3 consolidated url help into urls help topic and added information about path aliases Bill Barry <after.fallout@gmail.com> parents: 7691 diff changeset	2714
11007 a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2715 The path names ``default`` and ``default-push`` have a special
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2716 meaning. When performing a push or pull operation, they are used
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2717 as fallbacks if no location is specified on the command-line.
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2718 When ``default-push`` is set, it will be used for push and
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2719 ``default`` will be used for pull; otherwise ``default`` is used
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2720 as the fallback for both. When cloning a repository, the clone
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2721 source is written as ``default`` in ``.hg/hgrc``. Note that
11009 4d3288197717 commands: better markup in "hg help paths" Martin Geisler <mg@lazybytes.net> parents: 11008 diff changeset	2722 ``default`` and ``default-push`` apply to all inbound (e.g.
4d3288197717 commands: better markup in "hg help paths" Martin Geisler <mg@lazybytes.net> parents: 11008 diff changeset	2723 :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and
4d3288197717 commands: better markup in "hg help paths" Martin Geisler <mg@lazybytes.net> parents: 11008 diff changeset	2724 :hg:`bundle`) operations.
10933 e3396b218e10 Document 'default' and 'default-push' in paths docstring Faheem Mitha <faheem@email.unc.edu> parents: 10645 diff changeset	2725
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	2726 See :hg:`help urls` for more information.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2727 """
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2728 if search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2729 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2730 if name == search:
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2731 ui.write("%s\n" % url.hidepassword(path))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2732 return
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2733 ui.warn(_("not found!\n"))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2734 return 1
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2735 else:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2736 for name, path in ui.configitems("paths"):
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2737 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2738
5238 20817af258d8 pull -u: if "url#rev" was given, update to rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5236 diff changeset	2739 def postincoming(ui, repo, modheads, optupdate, checkout):
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2740 if modheads == 0:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2741 return
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2742 if optupdate:
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: 7369 diff changeset	2743 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
5238 20817af258d8 pull -u: if "url#rev" was given, update to rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5236 diff changeset	2744 return hg.update(repo, checkout)
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2745 else:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2746 ui.status(_("not updating, since new heads added\n"))
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2747 if modheads > 1:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2748 ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n"))
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2749 else:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2750 ui.status(_("(run 'hg update' to get a working copy)\n"))
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2751
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	2752 def pull(ui, repo, source="default", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2753 """pull changes from the specified source
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2754
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2755 Pull changes from a remote repository to a local one.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2756
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2757 This finds all changes from the repository at the specified path
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2758 or URL and adds them to a local repository (the current one unless
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2759 -R is specified). By default, this does not update the copy of the
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2760 project in the working directory.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2761
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2762 Use :hg:`incoming` if you want to see what would have been added
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2763 by a pull at the time you issued this command. If you then decide
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2764 to add those changes to the repository, you should use :hg:`pull
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2765 -r X` where ``X`` is the last changeset listed by :hg:`incoming`.
7980 3d8252430e17 commands: make pull help point to the incoming command Martin Geisler <mg@daimi.au.dk> parents: 7979 diff changeset	2766
7693 e040f9d6b2f3 consolidated url help into urls help topic and added information about path aliases Bill Barry <after.fallout@gmail.com> parents: 7691 diff changeset	2767 If SOURCE is omitted, the 'default' path will be used.
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	2768 See :hg:`help urls` for more information.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2769
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2770 Returns 0 on success, 1 if an update had unresolved files.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2771 """
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2772 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	2773 other = hg.repository(hg.remoteui(repo, opts), source)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2774 ui.status(_('pulling from %s\n') % url.hidepassword(source))
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2775 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2776 if revs:
5255 65dc707606ed Push capability checking into protocol-level code. Bryan O'Sullivan <bos@serpentine.com> parents: 5241 diff changeset	2777 try:
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2778 revs = [other.lookup(rev) for rev in revs]
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2779 except error.CapabilityError:
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2780 err = _("Other repository doesn't support revision lookup, "
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2781 "so a rev cannot be specified.")
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2782 raise util.Abort(err)
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2783
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2784 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
9645 02f40b2ece3f commands: use rev from remote repo when updating as part of a pull timeless@mozdev.org parents: 9644 diff changeset	2785 if checkout:
02f40b2ece3f commands: use rev from remote repo when updating as part of a pull timeless@mozdev.org parents: 9644 diff changeset	2786 checkout = str(repo.changelog.rev(other.lookup(checkout)))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2787 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	2788
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2493 diff changeset	2789 def push(ui, repo, dest=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2790 """push changes to the specified destination
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2791
11217 1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2792 Push changesets from the local repository to the specified
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2793 destination.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2794
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2795 This operation is symmetrical to pull: it is identical to a pull
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2796 in the destination repository from the current one.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2797
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2798 By default, push will not allow creation of new heads at the
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2799 destination, since multiple heads would make it unclear which head
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2800 to use. In this situation, it is recommended to pull and merge
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2801 before pushing.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2802
11219 39a7f69a0a9a commands: document --new-branch flag for push Martin Geisler <mg@aragost.com> parents: 11218 diff changeset	2803 Use --new-branch if you want to allow push to create a new named
39a7f69a0a9a commands: document --new-branch flag for push Martin Geisler <mg@aragost.com> parents: 11218 diff changeset	2804 branch that is not present at the destination. This allows you to
39a7f69a0a9a commands: document --new-branch flag for push Martin Geisler <mg@aragost.com> parents: 11218 diff changeset	2805 only create a new branch without forcing other changes.
39a7f69a0a9a commands: document --new-branch flag for push Martin Geisler <mg@aragost.com> parents: 11218 diff changeset	2806
11217 1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2807 Use -f/--force to override the default behavior and push all
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2808 changesets on all branches.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2809
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2810 If -r/--rev is used, the specified revision and all its ancestors
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2811 will be pushed to the remote repository.
7693 e040f9d6b2f3 consolidated url help into urls help topic and added information about path aliases Bill Barry <after.fallout@gmail.com> parents: 7691 diff changeset	2812
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	2813 Please see :hg:`help urls` for important details about ``ssh://``
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2814 URLs. If DESTINATION is omitted, a default path will be used.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2815
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2816 Returns 0 if push was successful, 1 if nothing to push.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2817 """
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2818 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2819 dest, branches = hg.parseurl(dest, opts.get('branch'))
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2820 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	2821 other = hg.repository(hg.remoteui(repo, opts), dest)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2822 ui.status(_('pushing to %s\n') % url.hidepassword(dest))
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2823 if revs:
b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2824 revs = [repo.lookup(rev) for rev in revs]
8815 e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2825
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2826 # push subrepos depth-first for coherent ordering
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2827 c = repo['']
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2828 subs = c.substate # only repos that are committed
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2829 for s in sorted(subs):
11067 49e14ec67144 subrepo: propagate and catch push failures Matt Mackall <mpm@selenic.com> parents: 11007 diff changeset	2830 if not c.sub(s).push(opts.get('force')):
49e14ec67144 subrepo: propagate and catch push failures Matt Mackall <mpm@selenic.com> parents: 11007 diff changeset	2831 return False
8815 e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2832
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11193 diff changeset	2833 r = repo.push(other, opts.get('force'), revs=revs,
e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11193 diff changeset	2834 newbranch=opts.get('new_branch'))
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2835 return r == 0
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	2836
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2837 def recover(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2838 """roll back an interrupted transaction
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2839
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2840 Recover from an interrupted commit or pull.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2841
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2842 This command tries to fix the repository status after an
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2843 interrupted operation. It should only be necessary when Mercurial
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2844 suggests it.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2845
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2846 Returns 0 if successful, 1 if nothing to recover or verify fails.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2847 """
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	2848 if repo.recover():
2802 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2800 diff changeset	2849 return hg.verify(repo)
2057 fef2d653beaf Never exit directly from commands.dispatch(), but pass return code to caller. Thomas Arendsen Hein <thomas@intevation.de> parents: 2056 diff changeset	2850 return 1
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2851
2179 520dd3d28e9b add --after option to remove command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2175 diff changeset	2852 def remove(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2853 """remove the specified files on the next commit
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2854
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2855 Schedule the indicated files for removal from the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2856
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2857 This only removes files from the current branch, not from the
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2858 entire project history. -A/--after can be used to remove only
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2859 files that have already been deleted, -f/--force can be used to
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2860 force deletion, and -Af can be used to remove files from the next
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2861 revision without deleting them from the working directory.
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2862
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2863 The following table details the behavior of remove for different
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2864 file states (columns) and option combinations (rows). The file
9237 16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	2865 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2866 reported by :hg:`status`). The actions are Warn, Remove (from
687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2867 branch) and Delete (from disk)::
9142 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	2868
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	2869 A C M !
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	2870 none W RD W R
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	2871 -f R RD RD R
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	2872 -A W W W R
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	2873 -Af R R R R
2309 b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	2874
3831 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3828 diff changeset	2875 This command schedules the files to be removed at the next commit.
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2876 To undo a remove before that, see :hg:`revert`.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2877
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2878 Returns 0 on success, 1 if any warnings encountered.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2879 """
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2880
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2881 ret = 0
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2882 after, force = opts.get('after'), opts.get('force')
8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2883 if not pats and not after:
2179 520dd3d28e9b add --after option to remove command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2175 diff changeset	2884 raise util.Abort(_('no files specified'))
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2885
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2886 m = cmdutil.match(repo, pats, opts)
6763 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2887 s = repo.status(match=m, clean=True)
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2888 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2889
8533 6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8462 diff changeset	2890 for f in m.files():
6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8462 diff changeset	2891 if f not in repo.dirstate and not os.path.isdir(m.rel(f)):
6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8462 diff changeset	2892 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2893 ret = 1
8533 6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8462 diff changeset	2894
6763 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2895 def warn(files, reason):
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2896 for f in files:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2897 ui.warn(_('not removing %s: file %s (use -f to force removal)\n')
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2898 % (m.rel(f), reason))
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2899 ret = 1
6763 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2900
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2901 if force:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2902 remove, forget = modified + deleted + clean, added
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2903 elif after:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2904 remove, forget = deleted, []
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2905 warn(modified + added + clean, _('still exists'))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2906 else:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2907 remove, forget = deleted + clean, []
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2908 warn(modified, _('is modified'))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2909 warn(added, _('has been marked for add'))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2910
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	2911 for f in sorted(remove + forget):
6763 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2912 if ui.verbose or not m.exact(f):
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2913 ui.status(_('removing %s\n') % m.rel(f))
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2914
11303 a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	2915 repo[None].forget(forget)
a1aad8333864 move working dir/dirstate methods from localrepo to workingctx Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11302 diff changeset	2916 repo[None].remove(remove, unlink=not after)
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2917 return ret
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2918
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2919 def rename(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2920 """rename files; equivalent of copy + remove
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2921
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2922 Mark dest as copies of sources; mark sources for deletion. If dest
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2923 is a directory, copies are put in that directory. If dest is a
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2924 file, there can only be one source.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2925
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2926 By default, this command copies the contents of files as they
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2927 exist in the working directory. If invoked with -A/--after, the
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2928 operation is recorded, but no copying is performed.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2929
7805 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	2930 This command takes effect at the next commit. To undo a rename
11193 687c7d395f20 Use our custom hg reStructuredText role some more Martin Geisler <mg@aragost.com> parents: 11185 diff changeset	2931 before that, see :hg:`revert`.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2932
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2933 Returns 0 on success, 1 if errors are encountered.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2934 """
4958 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4950 diff changeset	2935 wlock = repo.wlock(False)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2936 try:
5626 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5619 diff changeset	2937 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	2938 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	2939 wlock.release()
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2940
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2941 def resolve(ui, repo, pats, *opts):
10559 b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2942 """various operations to help finish a merge
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2943
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2944 This command includes several actions that are often useful while
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2945 performing a merge, after running ``merge`` but before running
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2946 ``commit``. (It is only meaningful if your working directory has
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2947 two parents.) It is most relevant for merges with unresolved
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2948 conflicts, which are typically a result of non-interactive merging with
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2949 ``internal:merge`` or a command-line merge tool like ``diff3``.
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2950
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2951 The available actions are:
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2952
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2953 1) list files that were merged with conflicts (U, for unresolved)
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2954 and without conflicts (R, for resolved): ``hg resolve -l``
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2955 (this is like ``status`` for merges)
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2956 2) record that you have resolved conflicts in certain files:
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2957 ``hg resolve -m [file ...]`` (default: mark all unresolved files)
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2958 3) forget that you have resolved conflicts in certain files:
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2959 ``hg resolve -u [file ...]`` (default: unmark all resolved files)
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2960 4) discard your current attempt(s) at resolving conflicts and
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2961 restart the merge from scratch: ``hg resolve file...``
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2962 (or ``-a`` for all unresolved files)
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2963
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2964 Note that Mercurial will not let you commit files with unresolved merge
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2965 conflicts. You must use ``hg resolve -m ...`` before you can commit
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2966 after a conflicting merge.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2967
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2968 Returns 0 on success, 1 if any files fail a resolve attempt.
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2969 """
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2970
9646 5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2971 all, mark, unmark, show, nostatus = \
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2972 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
7534 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2973
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2974 if (show and (mark or unmark)) or (mark and unmark):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2975 raise util.Abort(_("too many options specified"))
7534 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2976 if pats and all:
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2977 raise util.Abort(_("can't specify --all and patterns"))
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2978 if not (all or pats or show or mark or unmark):
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2979 raise util.Abort(_('no files or directories specified; '
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2980 'use --all to remerge all files'))
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2981
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10650 diff changeset	2982 ms = mergemod.mergestate(repo)
6594 fca1688f0459 resolve: use cmdutil.match Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	2983 m = cmdutil.match(repo, pats, opts)
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	2984 ret = 0
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2985
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2986 for f in ms:
6594 fca1688f0459 resolve: use cmdutil.match Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	2987 if m(f):
7534 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2988 if show:
9646 5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2989 if nostatus:
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2990 ui.write("%s\n" % f)
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2991 else:
10817 2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	2992 ui.write("%s %s\n" % (ms[f].upper(), f),
2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	2993 label='resolve.' +
2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	2994 {'u': 'unresolved', 'r': 'resolved'}[ms[f]])
7534 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2995 elif mark:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2996 ms.mark(f, "r")
7534 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2997 elif unmark:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2998 ms.mark(f, "u")
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	2999 else:
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	3000 wctx = repo[None]
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	3001 mctx = wctx.parents()[-1]
7847 30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3002
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3003 # backup pre-resolve (merge uses .orig for its own purposes)
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3004 a = repo.wjoin(f)
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3005 util.copyfile(a, a + ".resolve")
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3006
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3007 # resolve file
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3008 if ms.resolve(f, wctx, mctx):
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3009 ret = 1
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	3010
7847 30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3011 # replace filemerge's .orig file with our resolve file
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3012 util.rename(a + ".resolve", a + ".orig")
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3013 return ret
7847 30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7830 diff changeset	3014
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	3015 def revert(ui, repo, pats, *opts):
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 8021 diff changeset	3016 """restore individual files or directories to an earlier state
5614 d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5613 diff changeset	3017
8287 824ed0e35480 commands: fix capitalization in revert help text Martin Geisler <mg@lazybytes.net> parents: 8282 diff changeset	3018 (Use update -r to check out earlier revisions, revert does not
824ed0e35480 commands: fix capitalization in revert help text Martin Geisler <mg@lazybytes.net> parents: 8282 diff changeset	3019 change the working directory parents.)
2204 eb5fa83ffcfa fix doc comments for revert command. people found them confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	3020
2212 8164e3f31638 revert: require explicit revision when working dir has two parents. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2204 diff changeset	3021 With no revision specified, revert the named files or directories
8164e3f31638 revert: require explicit revision when working dir has two parents. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2204 diff changeset	3022 to the contents they had in the parent of the working directory.
8164e3f31638 revert: require explicit revision when working dir has two parents. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2204 diff changeset	3023 This restores the contents of the affected files to an unmodified
3831 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3828 diff changeset	3024 state and unschedules adds, removes, copies, and renames. If the
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	3025 working directory has two parents, you must explicitly specify a
a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	3026 revision.
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	3027
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	3028 Using the -r/--rev option, revert the given files or directories
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	3029 to their contents as of a specific revision. This can be helpful
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3030 to "roll back" some or all of an earlier change. See :hg:`help
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3031 dates` for a list of formats valid for -d/--date.
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	3032
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	3033 Revert modifies the working directory. It does not commit any
cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	3034 changes, or change the parent of the working directory. If you
2204 eb5fa83ffcfa fix doc comments for revert command. people found them confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	3035 revert to a revision other than the parent of the working
eb5fa83ffcfa fix doc comments for revert command. people found them confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	3036 directory, the reverted files will thus appear modified
eb5fa83ffcfa fix doc comments for revert command. people found them confusing. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2189 diff changeset	3037 afterwards.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3038
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3039 If a file has been deleted, it is restored. If the executable mode
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3040 of a file was changed, it is reset.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3041
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	3042 If names are given, all files matching the names are reverted.
2965 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	3043 If no arguments are given, no files are reverted.
5614 d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5613 diff changeset	3044
d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5613 diff changeset	3045 Modified files are saved with a .orig suffix before reverting.
d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5613 diff changeset	3046 To disable these backups, use --no-backup.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3047
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3048 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3049 """
2965 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	3050
3818 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3051 if opts["date"]:
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3052 if opts["rev"]:
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3053 raise util.Abort(_("you can't specify a revision and a date"))
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3054 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3055
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3056 if not pats and not opts.get('all'):
3017 ea2a9c13afc6 Add a hint for revert --all when aborting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3013 diff changeset	3057 raise util.Abort(_('no files or directories specified; '
ea2a9c13afc6 Add a hint for revert --all when aborting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3013 diff changeset	3058 'use --all to revert the whole repo'))
2965 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	3059
2212 8164e3f31638 revert: require explicit revision when working dir has two parents. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2204 diff changeset	3060 parent, p2 = repo.dirstate.parents()
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3061 if not opts.get('rev') and p2 != nullid:
3127 81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	3062 raise util.Abort(_('uncommitted merge - please provide a '
81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	3063 'specific revision'))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3064 ctx = repo[opts.get('rev')]
3972 356e20d46b34 commands.py: use contexts in various places (debugstate, revert) Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 3951 diff changeset	3065 node = ctx.node()
356e20d46b34 commands.py: use contexts in various places (debugstate, revert) Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 3951 diff changeset	3066 mf = ctx.manifest()
2407 8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	3067 if node == parent:
8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	3068 pmf = mf
8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	3069 else:
8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	3070 pmf = None
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3071
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	3072 # need all matching names in dirstate and manifest of target rev,
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	3073 # so have to walk both. do not print errors if files exist in one
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	3074 # but not other.
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	3075
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3076 names = {}
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	3077
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3078 wlock = repo.wlock()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3079 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3080 # walk dirstate.
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	3081
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	3082 m = cmdutil.match(repo, pats, opts)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3083 m.bad = lambda x, y: False
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	3084 for abs in repo.walk(m):
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	3085 names[abs] = m.rel(abs), m.exact(abs)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3086
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3087 # walk target manifest.
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3088
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	3089 def badfn(path, msg):
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3090 if path in names:
8680 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	3091 return
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3092 path_ = path + '/'
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3093 for f in names:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3094 if f.startswith(path_):
8680 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	3095 return
8615 94ca38e63576 use ui instead of repo.ui when the former is in scope Martin Geisler <mg@lazybytes.net> parents: 8544 diff changeset	3096 ui.warn("%s: %s\n" % (m.rel(path), msg))
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3097
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	3098 m = cmdutil.match(repo, pats, opts)
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	3099 m.bad = badfn
6783 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6764 diff changeset	3100 for abs in repo[node].walk(m):
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	3101 if abs not in names:
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	3102 names[abs] = m.rel(abs), m.exact(abs)
6044 7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3103
6599 cd4db3999ef9 status: use match helpers for various users Matt Mackall <mpm@selenic.com> parents: 6594 diff changeset	3104 m = cmdutil.matchfiles(repo, names)
6603 41eb20cc1c02 match: remove files arg from repo.status and friends Matt Mackall <mpm@selenic.com> parents: 6602 diff changeset	3105 changes = repo.status(match=m)[:4]
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	3106 modified, added, removed, deleted = map(set, changes)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3107
5263 d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3108 # if f is a rename, also revert the source
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3109 cwd = repo.getcwd()
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3110 for f in added:
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3111 src = repo.dirstate.copied(f)
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3112 if src and src not in names and repo.dirstate[src] == 'r':
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	3113 removed.add(src)
5263 d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3114 names[src] = (repo.pathto(src, cwd), True)
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5255 5262 diff changeset	3115
6106 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3116 def removeforget(abs):
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3117 if repo.dirstate[abs] == 'a':
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3118 return _('forgetting %s\n')
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3119 return _('removing %s\n')
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3120
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3121 revert = ([], _('reverting %s\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3122 add = ([], _('adding %s\n'))
6106 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3123 remove = ([], removeforget)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3124 undelete = ([], _('undeleting %s\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3125
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3126 disptable = (
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3127 # dispatch table:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3128 # file state
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3129 # action if in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3130 # action if not in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3131 # make backup if in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3132 # make backup if not in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3133 (modified, revert, remove, True, True),
6106 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3134 (added, revert, remove, True, False),
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3135 (removed, undelete, None, False, False),
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3136 (deleted, revert, remove, False, False),
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3137 )
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3138
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	3139 for abs, (rel, exact) in sorted(names.items()):
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3140 mfentry = mf.get(abs)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3141 target = repo.wjoin(abs)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3142 def handle(xlist, dobackup):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3143 xlist[0].append(abs)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3144 if dobackup and not opts.get('no_backup') and util.lexists(target):
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3145 bakname = "%s.orig" % rel
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3146 ui.note(_('saving current version of %s as %s\n') %
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3147 (rel, bakname))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3148 if not opts.get('dry_run'):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3149 util.copyfile(target, bakname)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3150 if ui.verbose or not exact:
6106 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3151 msg = xlist[1]
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3152 if not isinstance(msg, basestring):
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3153 msg = msg(abs)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3154 ui.status(msg % rel)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3155 for table, hitlist, misslist, backuphit, backupmiss in disptable:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3156 if abs not in table:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3157 continue
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3158 # file has changed in dirstate
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3159 if mfentry:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3160 handle(hitlist, backuphit)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3161 elif misslist is not None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3162 handle(misslist, backupmiss)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3163 break
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3164 else:
6044 7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3165 if abs not in repo.dirstate:
7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3166 if mfentry:
7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3167 handle(add, True)
7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3168 elif exact:
7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3169 ui.warn(_('file not managed: %s\n') % rel)
7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6043 diff changeset	3170 continue
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3171 # file has not changed in dirstate
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3172 if node == parent:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3173 if exact:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3174 ui.warn(_('no changes needed to %s\n') % rel)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3175 continue
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3176 if pmf is None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3177 # only need parent manifest in this unlikely case,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3178 # so do not read by default
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	3179 pmf = repo[parent].manifest()
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3180 if abs in pmf:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3181 if mfentry:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3182 # if version of file is same in parent and target
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3183 # manifests, do nothing
6043 d0dbae32517c revert: revert clean files when only a change of flags is needed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5998 diff changeset	3184 if (pmf[abs] != mfentry or
d0dbae32517c revert: revert clean files when only a change of flags is needed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5998 diff changeset	3185 pmf.flags(abs) != mf.flags(abs)):
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3186 handle(revert, False)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3187 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3188 handle(remove, False)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3189
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3190 if not opts.get('dry_run'):
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3191 def checkout(f):
41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3192 fc = ctx[f]
6745 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6742 diff changeset	3193 repo.wwrite(f, fc.data(), fc.flags())
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3194
6106 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3195 audit_path = util.path_auditor(repo.root)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3196 for f in remove[0]:
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3197 if repo.dirstate[f] == 'a':
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3198 repo.dirstate.forget(f)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3199 continue
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3200 audit_path(f)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3201 try:
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3202 util.unlink(repo.wjoin(f))
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3203 except OSError:
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3204 pass
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6105 diff changeset	3205 repo.dirstate.remove(f)
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3206
6299 653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3207 normal = None
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3208 if node == parent:
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3209 # We're reverting to our parent. If possible, we'd like status
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3210 # to report the file as clean. We have to use normallookup for
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3211 # merges to avoid losing information about merged/dirty files.
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3212 if p2 != nullid:
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3213 normal = repo.dirstate.normallookup
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3214 else:
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3215 normal = repo.dirstate.normal
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3216 for f in revert[0]:
41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3217 checkout(f)
6299 653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3218 if normal:
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	3219 normal(f)
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3220
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3221 for f in add[0]:
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3222 checkout(f)
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3223 repo.dirstate.add(f)
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3224
6105 5086576a2152 revert: only call dirstate.normal when we know the file is clean Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6104 diff changeset	3225 normal = repo.dirstate.normallookup
5086576a2152 revert: only call dirstate.normal when we know the file is clean Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6104 diff changeset	3226 if node == parent and p2 == nullid:
5086576a2152 revert: only call dirstate.normal when we know the file is clean Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6104 diff changeset	3227 normal = repo.dirstate.normal
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3228 for f in undelete[0]:
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3229 checkout(f)
6105 5086576a2152 revert: only call dirstate.normal when we know the file is clean Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6104 diff changeset	3230 normal(f)
6104 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6103 diff changeset	3231
4959 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4958 diff changeset	3232 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	3233 wlock.release()
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	3234
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10835 diff changeset	3235 def rollback(ui, repo, **opts):
10889 e25c450c351e commands: improve some command summaries Matt Mackall <mpm@selenic.com> parents: 10882 diff changeset	3236 """roll back the last transaction (dangerous)
5615 8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5614 diff changeset	3237
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5614 diff changeset	3238 This command should be used with care. There is only one level of
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5614 diff changeset	3239 rollback, and there is no way to undo a rollback. It will also
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5614 diff changeset	3240 restore the dirstate at the time of the last transaction, losing
8856 f8d00346a62d rollback: minor clarification (issue828) Matt Mackall <mpm@selenic.com> parents: 8855 diff changeset	3241 any dirstate changes since that time. This command does not alter
f8d00346a62d rollback: minor clarification (issue828) Matt Mackall <mpm@selenic.com> parents: 8855 diff changeset	3242 the working directory.
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3243
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3244 Transactions are used to encapsulate the effects of all commands
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3245 that create new changesets or propagate existing changesets into a
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3246 repository. For example, the following commands are transactional,
9893 af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	3247 and their effects can be rolled back:
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	3248
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	3249 - commit
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	3250 - import
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	3251 - pull
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	3252 - push (with this repository as the destination)
9893 af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	3253 - unbundle
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3254
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3255 This command is not intended for use on public repositories. Once
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3256 changes are visible for pull by other users, rolling a transaction
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3257 back locally is ineffective (someone else may already have pulled
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3258 the changes). Furthermore, a race is possible with readers of the
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3259 repository; for example an in-progress pull from the repository
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3260 may fail if a rollback is performed.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3261
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3262 Returns 0 on success, 1 if no rollback data is available.
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3263 """
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3264 return repo.rollback(opts.get('dry_run'))
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	3265
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	3266 def root(ui, repo):
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 8021 diff changeset	3267 """print the root (top) of the current working directory
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3268
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3269 Print the root directory of the current repository.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3270
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3271 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3272 """
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	3273 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	3274
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	3275 def serve(ui, repo, **opts):
10889 e25c450c351e commands: improve some command summaries Matt Mackall <mpm@selenic.com> parents: 10882 diff changeset	3276 """start stand-alone webserver
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3277
11102 275198bc904a commands: explain that "hg serve" is mostly for ad-hoc sharing Martin Geisler <mg@lazybytes.net> parents: 11087 diff changeset	3278 Start a local HTTP repository browser and pull server. You can use
275198bc904a commands: explain that "hg serve" is mostly for ad-hoc sharing Martin Geisler <mg@lazybytes.net> parents: 11087 diff changeset	3279 this for ad-hoc sharing and browing of repositories. It is
275198bc904a commands: explain that "hg serve" is mostly for ad-hoc sharing Martin Geisler <mg@lazybytes.net> parents: 11087 diff changeset	3280 recommended to use a real web server to serve a repository for
275198bc904a commands: explain that "hg serve" is mostly for ad-hoc sharing Martin Geisler <mg@lazybytes.net> parents: 11087 diff changeset	3281 longer periods of time.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3282
11103 d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	3283 Please note that the server does not implement access control.
d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	3284 This means that, by default, anybody can read from the server and
d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	3285 nobody can write to it by default. Set the ``web.allow_push``
d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	3286 option to ``*`` to allow everybody to push to the server. You
d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	3287 should use a real web server if you need to authenticate users.
d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	3288
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3289 By default, the server logs accesses to stdout and errors to
8275 b9403042968a write options in "-r/--rev" style in help texts Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3290 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
b9403042968a write options in "-r/--rev" style in help texts Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3291 files.
10629 d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3292
d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3293 To have the server choose a free port number to listen on, specify
d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3294 a port number of 0; in this case, the server will print the port
d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3295 number it uses.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3296
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3297 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3298 """
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	3299
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	3300 if opts["stdio"]:
2127 8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2125 diff changeset	3301 if repo is None:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	3302 raise error.RepoError(_("There is no Mercurial repository here"
6217 fe8dbbe9520d Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg Joel Rosdahl <joel@rosdahl.net> parents: 6212 diff changeset	3303 " (.hg not found)"))
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2392 diff changeset	3304 s = sshserver.sshserver(ui, repo)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2392 diff changeset	3305 s.serve_forever()
2363 fa4c11751367 Give a response to unknown SSH commands Matt Mackall <mpm@selenic.com> parents: 2362 diff changeset	3306
10635 27027bee318e serve: fix port config Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10632 diff changeset	3307 # this way we can check if something was given in the command-line
27027bee318e serve: fix port config Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10632 diff changeset	3308 if opts.get('port'):
27027bee318e serve: fix port config Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10632 diff changeset	3309 opts['port'] = int(opts.get('port'))
27027bee318e serve: fix port config Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10632 diff changeset	3310
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	3311 baseui = repo and repo.baseui or ui
5836 bd34f0ac3cb0 adding "prefix" option to "hg serve" (command line and [web] section) Michele Cella <michele.cella@gmail.com> parents: 5810 diff changeset	3312 optlist = ("name templates style address port prefix ipv6"
10644 63948e7d37f7 server: initialize wsgi app in command, then wrap server around it Dirkjan Ochtman <djc.ochtman@kentyde.com> parents: 10635 diff changeset	3313 " accesslog errorlog certificate encoding")
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	3314 for o in optlist.split():
10630 9947e6b008bb serve: fix options recording, trailing whitespace Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10629 diff changeset	3315 val = opts.get(o, '')
10631 5247260cee6a make expression shorter, now the line fits into 80 chars Thomas Arendsen Hein <thomas@intevation.de> parents: 10630 diff changeset	3316 if val in (None, ''): # should check against default options instead
10630 9947e6b008bb serve: fix options recording, trailing whitespace Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10629 diff changeset	3317 continue
9947e6b008bb serve: fix options recording, trailing whitespace Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10629 diff changeset	3318 baseui.setconfig("web", o, val)
9947e6b008bb serve: fix options recording, trailing whitespace Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10629 diff changeset	3319 if repo and repo.ui != baseui:
9947e6b008bb serve: fix options recording, trailing whitespace Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10629 diff changeset	3320 repo.ui.setconfig("web", o, val)
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	3321
11003 aca9a7cf2c9a serve: webdir_conf -> webconf Matt Mackall <mpm@selenic.com> parents: 10993 diff changeset	3322 o = opts.get('web_conf') or opts.get('webdir_conf')
11004 7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3323 if not o:
7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3324 if not repo:
7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3325 raise error.RepoError(_("There is no Mercurial repository"
7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3326 " here (.hg not found)"))
7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3327 o = repo.root
7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3328
7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3329 app = hgweb.hgweb(o, baseui=ui)
2127 8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2125 diff changeset	3330
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	3331 class service(object):
4378 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3332 def init(self):
4672 272c0a09b203 Handle CTRL+C in serve under Windows. Marcos Chaves <marcos.nospam@gmail.com> parents: 4659 diff changeset	3333 util.set_signal_handler()
11004 7bb10d3dbcd6 hgweb: unify hgweb calls in serve Matt Mackall <mpm@selenic.com> parents: 11003 diff changeset	3334 self.httpd = hgweb.server.create_server(ui, app)
4378 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3335
10629 d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3336 if opts['port'] and not ui.verbose:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3337 return
4378 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3338
5970 f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5951 diff changeset	3339 if self.httpd.prefix:
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5951 diff changeset	3340 prefix = self.httpd.prefix.strip('/') + '/'
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5951 diff changeset	3341 else:
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5951 diff changeset	3342 prefix = ''
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5951 diff changeset	3343
6262 de7256c82fad hgweb: clarify which address and port can/cannot be bound at startup (bug 769) Stephen Deasey <sdeasey@gmail.com> parents: 6253 diff changeset	3344 port = ':%d' % self.httpd.port
de7256c82fad hgweb: clarify which address and port can/cannot be bound at startup (bug 769) Stephen Deasey <sdeasey@gmail.com> parents: 6253 diff changeset	3345 if port == ':80':
de7256c82fad hgweb: clarify which address and port can/cannot be bound at startup (bug 769) Stephen Deasey <sdeasey@gmail.com> parents: 6253 diff changeset	3346 port = ''
de7256c82fad hgweb: clarify which address and port can/cannot be bound at startup (bug 769) Stephen Deasey <sdeasey@gmail.com> parents: 6253 diff changeset	3347
6419 7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3348 bindaddr = self.httpd.addr
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3349 if bindaddr == '0.0.0.0':
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3350 bindaddr = '*'
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3351 elif ':' in bindaddr: # IPv6
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3352 bindaddr = '[%s]' % bindaddr
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3353
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3354 fqaddr = self.httpd.fqaddr
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3355 if ':' in fqaddr:
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	3356 fqaddr = '[%s]' % fqaddr
10629 d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3357 if opts['port']:
10630 9947e6b008bb serve: fix options recording, trailing whitespace Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10629 diff changeset	3358 write = ui.status
10629 d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3359 else:
d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3360 write = ui.write
d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3361 write(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
d3f27d15c9cb serve: allow --port=0 to specify "server chooses the port number" Bryan O'Sullivan <bos@serpentine.com> parents: 10617 diff changeset	3362 (fqaddr, port, prefix, bindaddr, self.httpd.port))
4378 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3363
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3364 def run(self):
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3365 self.httpd.serve_forever()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3366
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3367 service = service()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3368
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4374 diff changeset	3369 cmdutil.service(opts, initfn=service.init, runfn=service.run)
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	3370
731 91ca3afab8e8 Add name matching to status command. Bryan O'Sullivan <bos@serpentine.com> parents: 729 diff changeset	3371 def status(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3372 """show changed files in the working directory
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	3373
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	3374 Show status of files in the repository. If names are given, only
cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	3375 files that match are shown. Files that are clean or ignored or
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3376 the source of a copy/move operation, are not listed unless
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3377 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3378 Unless options described with "show only ..." are given, the
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3379 options -mardu are used.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3380
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6200 diff changeset	3381 Option -q/--quiet hides untracked (unknown and ignored) files
8009 76e4c08a48ad commands: fix typo on flag description Wagner Bruna <wbruna@yahoo.com> parents: 8008 diff changeset	3382 unless explicitly requested with -u/--unknown or -i/--ignored.
6200 acc40572da5b 'hg status -q' output skips non-tracked files. Zoran Bosnjak <zoran.bosnjak@via.si> parents: 6192 diff changeset	3383
3828 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	3384 NOTE: status may appear to disagree with diff if permissions have
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	3385 changed or a merge has occurred. The standard diff format does not
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	3386 report permission changes and diff only reports changes relative
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	3387 to one merge parent.
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3819 diff changeset	3388
3462 2b3b703b3a2b Add --rev option to status Brendan Cully <brendan@kublai.com> parents: 3460 diff changeset	3389 If one revision is given, it is used as the base revision.
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3390 If two revisions are given, the differences between them are
10014 54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3391 shown. The --change option can also be used as a shortcut to list
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3392 the changed files of a revision from its first parent.
3462 2b3b703b3a2b Add --rev option to status Brendan Cully <brendan@kublai.com> parents: 3460 diff changeset	3393
9142 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3394 The codes used to show the status of files are::
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3395
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3396 M = modified
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3397 A = added
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3398 R = removed
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3399 C = clean
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3400 ! = missing (deleted by non-hg command, but still tracked)
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3401 ? = not tracked
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3402 I = ignored
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9139 diff changeset	3403 = origin of the previous file listed as A (added)
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3404
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3405 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3406 """
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	3407
10014 54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3408 revs = opts.get('rev')
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3409 change = opts.get('change')
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3410
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3411 if revs and change:
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3412 msg = _('cannot specify --rev and --change at the same time')
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3413 raise util.Abort(msg)
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3414 elif change:
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3415 node2 = repo.lookup(change)
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3416 node1 = repo[node2].parents()[0].node()
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3417 else:
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3418 node1, node2 = cmdutil.revpair(repo, revs)
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3419
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	3420 cwd = (pats and repo.getcwd()) or ''
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3421 end = opts.get('print0') and '\0' or '\n'
6276 c93ca83a3354 status: find copies and renames beyond the working directory Matt Mackall <mpm@selenic.com> parents: 6262 diff changeset	3422 copy = {}
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3423 states = 'modified added removed deleted unknown ignored clean'.split()
7684 ee3364d3d859 status: make options optional (issue1481) Alexander Solovyov <piranha@piranha.org.ua> parents: 7656 diff changeset	3424 show = [k for k in states if opts.get(k)]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3425 if opts.get('all'):
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3426 show += ui.quiet and (states[:4] + ['clean']) or states
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3427 if not show:
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3428 show = ui.quiet and states[:4] or states[:5]
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3429
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3430 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3431 'ignored' in show, 'clean' in show, 'unknown' in show)
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3432 changestates = zip(states, 'MAR!?IC', stat)
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3433
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3434 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	3435 ctxn = repo[nullid]
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	3436 ctx1 = repo[node1]
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	3437 ctx2 = repo[node2]
6658 9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6638 diff changeset	3438 added = stat[1]
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6638 diff changeset	3439 if node2 is None:
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6638 diff changeset	3440 added = stat[0] + stat[1] # merged?
6742 b148e9099133 use repo.changectx(None) to get a workingctx Matt Mackall <mpm@selenic.com> parents: 6741 diff changeset	3441
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7595 diff changeset	3442 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
6658 9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6638 diff changeset	3443 if k in added:
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6638 diff changeset	3444 copy[k] = v
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6638 diff changeset	3445 elif v in added:
6276 c93ca83a3354 status: find copies and renames beyond the working directory Matt Mackall <mpm@selenic.com> parents: 6262 diff changeset	3446 copy[v] = k
c93ca83a3354 status: find copies and renames beyond the working directory Matt Mackall <mpm@selenic.com> parents: 6262 diff changeset	3447
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3448 for state, char, files in changestates:
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3449 if state in show:
1966 f8b0e73e320f hg status cleanups: Don't translate long options, remove stray semicolon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1965 diff changeset	3450 format = "%s %%s%s" % (char, end)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3451 if opts.get('no_status'):
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3452 format = "%%s%s" % end
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3453
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3454 for f in files:
10817 2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	3455 ui.write(format % repo.pathto(f, cwd),
2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	3456 label='status.' + state)
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3457 if f in copy:
10817 2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	3458 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end),
2096496b40ec status: make use of output labeling Brodie Rao <brodie@bitheap.org> parents: 10816 diff changeset	3459 label='status.copied')
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	3460
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3461 def summary(ui, repo, **opts):
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3462 """summarize working directory state
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3463
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3464 This generates a brief summary of the working directory state,
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3465 including parents, branch, commit status, and available updates.
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3466
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3467 With the --remote option, this will check the default paths for
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3468 incoming and outgoing changes. This can be time-consuming.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3469
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3470 Returns 0 on success.
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3471 """
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3472
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3473 ctx = repo[None]
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3474 parents = ctx.parents()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3475 pnode = parents[0].node()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3476
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3477 for p in parents:
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3478 # label with log.changeset (instead of log.parent) since this
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3479 # shows a working directory parent changeset:
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3480 ui.write(_('parent: %d:%s ') % (p.rev(), str(p)),
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3481 label='log.changeset')
10833 d7b601f1e02c commands: retrieve tags from context object Martin Geisler <mg@lazybytes.net> parents: 10832 diff changeset	3482 ui.write(' '.join(p.tags()), label='log.tag')
9618 d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3483 if p.rev() == -1:
d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3484 if not len(repo):
10834 4ab459a6c25c commands: small refactoring in summary Martin Geisler <mg@lazybytes.net> parents: 10833 diff changeset	3485 ui.write(_(' (empty repository)'))
9618 d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3486 else:
10834 4ab459a6c25c commands: small refactoring in summary Martin Geisler <mg@lazybytes.net> parents: 10833 diff changeset	3487 ui.write(_(' (no revision checked out)'))
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3488 ui.write('\n')
9618 d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3489 if p.description():
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3490 ui.status(' ' + p.description().splitlines()[0].strip() + '\n',
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3491 label='log.summary')
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3492
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3493 branch = ctx.branch()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3494 bheads = repo.branchheads(branch)
9873 541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3495 m = _('branch: %s\n') % branch
541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3496 if branch != 'default':
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3497 ui.write(m, label='log.branch')
9873 541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3498 else:
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3499 ui.status(m, label='log.branch')
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3500
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3501 st = list(repo.status(unknown=True))[:6]
11090 c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3502
11331 997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3503 c = repo.dirstate.copies()
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3504 copied, renamed = [], []
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3505 for d, s in c.iteritems():
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3506 if s in st[2]:
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3507 st[2].remove(s)
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3508 renamed.append(d)
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3509 else:
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3510 copied.append(d)
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3511 if d in st[1]:
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3512 st[1].remove(d)
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3513 st.insert(3, renamed)
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3514 st.insert(4, copied)
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3515
10651 5f091fc1bab7 style: use consistent variable names (mod) with imports which would shadow Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 10650 diff changeset	3516 ms = mergemod.mergestate(repo)
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3517 st.append([f for f in ms if ms[f] == 'u'])
11090 c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3518
c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3519 subs = [s for s in ctx.substate if ctx.sub(s).dirty()]
c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3520 st.append(subs)
c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3521
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3522 labels = [ui.label(_('%d modified'), 'status.modified'),
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3523 ui.label(_('%d added'), 'status.added'),
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3524 ui.label(_('%d removed'), 'status.removed'),
11331 997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3525 ui.label(_('%d renamed'), 'status.copied'),
997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3526 ui.label(_('%d copied'), 'status.copied'),
10832 420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3527 ui.label(_('%d deleted'), 'status.deleted'),
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3528 ui.label(_('%d unknown'), 'status.unknown'),
420bc8124904 summary: make use of output labeling Eric Eisner <ede@mit.edu> parents: 10830 diff changeset	3529 ui.label(_('%d ignored'), 'status.ignored'),
11090 c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3530 ui.label(_('%d unresolved'), 'resolve.unresolved'),
c4347e48b0d0 summary: add subrepo status Matt Mackall <mpm@selenic.com> parents: 11078 diff changeset	3531 ui.label(_('%d subrepos'), 'status.modified')]
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3532 t = []
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3533 for s, l in zip(st, labels):
9604 8e0e0d854b60 commands: do not split a translated string Martin Geisler <mg@lazybytes.net> parents: 9603 diff changeset	3534 if s:
8e0e0d854b60 commands: do not split a translated string Martin Geisler <mg@lazybytes.net> parents: 9603 diff changeset	3535 t.append(l % len(s))
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3536
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3537 t = ', '.join(t)
10269 acf001ee5ef8 summary: L10N messages hide clean-ness of workdir from 'hg summary' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 10263 diff changeset	3538 cleanworkdir = False
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3539
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3540 if len(parents) > 1:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3541 t += _(' (merge)')
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3542 elif branch != parents[0].branch():
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3543 t += _(' (new branch)')
11165 e8915e19205a summary: show if commit will be from a closed head Gilles Moris <gilles.moris@free.fr> parents: 11164 diff changeset	3544 elif (parents[0].extra().get('close') and
e8915e19205a summary: show if commit will be from a closed head Gilles Moris <gilles.moris@free.fr> parents: 11164 diff changeset	3545 pnode in repo.branchheads(branch, closed=True)):
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3546 t += _(' (head closed)')
11331 997ab9af81df summary: report copies and renames Matt Mackall <mpm@selenic.com> parents: 11321 diff changeset	3547 elif not (st[0] or st[1] or st[2] or st[3] or st[4] or st[9]):
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3548 t += _(' (clean)')
10269 acf001ee5ef8 summary: L10N messages hide clean-ness of workdir from 'hg summary' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 10263 diff changeset	3549 cleanworkdir = True
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3550 elif pnode not in bheads:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3551 t += _(' (new branch head)')
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3552
10269 acf001ee5ef8 summary: L10N messages hide clean-ness of workdir from 'hg summary' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 10263 diff changeset	3553 if cleanworkdir:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3554 ui.status(_('commit: %s\n') % t.strip())
9615 3194227a4158 summary: quieter with -q Matt Mackall <mpm@selenic.com> parents: 9614 diff changeset	3555 else:
11310 ac873ecfc3c2 Backed out changeset: e1dde7363601 Steve Borho <steve@borho.org> parents: 11302 diff changeset	3556 ui.write(_('commit: %s\n') % t.strip())
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3557
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3558 # all ancestors of branch heads - all ancestors of parent = new csets
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3559 new = [0] * len(repo)
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3560 cl = repo.changelog
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3561 for a in [cl.rev(n) for n in bheads]:
f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3562 new[a] = 1
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3563 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3564 new[a] = 1
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3565 for a in [p.rev() for p in parents]:
f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3566 if a >= 0:
f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3567 new[a] = 0
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3568 for a in cl.ancestors(*[p.rev() for p in parents]):
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3569 new[a] = 0
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3570 new = sum(new)
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3571
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3572 if new == 0:
9615 3194227a4158 summary: quieter with -q Matt Mackall <mpm@selenic.com> parents: 9614 diff changeset	3573 ui.status(_('update: (current)\n'))
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3574 elif pnode not in bheads:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3575 ui.write(_('update: %d new changesets (update)\n') % new)
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3576 else:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3577 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3578 (new, len(bheads)))
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	3579
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3580 if opts.get('remote'):
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3581 t = []
10389 6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3582 source, branches = hg.parseurl(ui.expandpath('default'))
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	3583 other = hg.repository(hg.remoteui(repo, {}), source)
10389 6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3584 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3585 ui.debug('comparing with %s\n' % url.hidepassword(source))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3586 repo.ui.pushbuffer()
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	3587 common, incoming, rheads = discovery.findcommonincoming(repo, other)
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3588 repo.ui.popbuffer()
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3589 if incoming:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3590 t.append(_('1 or more incoming'))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3591
10389 6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3592 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3593 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
11273 d1908cb95a82 remoteui: move from cmdutil to hg Matt Mackall <mpm@selenic.com> parents: 11219 diff changeset	3594 other = hg.repository(hg.remoteui(repo, {}), dest)
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3595 ui.debug('comparing with %s\n' % url.hidepassword(dest))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3596 repo.ui.pushbuffer()
11301 3d0591a66118 move discovery methods from localrepo into new discovery module Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 11297 diff changeset	3597 o = discovery.findoutgoing(repo, other)
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3598 repo.ui.popbuffer()
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3599 o = repo.changelog.nodesbetween(o, None)[0]
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3600 if o:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3601 t.append(_('%d outgoing') % len(o))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3602
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3603 if t:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3604 ui.write(_('remote: %s\n') % (', '.join(t)))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3605 else:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3606 ui.status(_('remote: (synced)\n'))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3607
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3608 def tag(ui, repo, name1, names, *opts):
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3609 """add one or more tags for the current or given revision
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3610
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3611 Name a particular revision using <name>.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3612
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3613 Tags are used to name particular revisions of the repository and are
6220 1939e29151ca Fixed typo in tag help, found by John Coomes Thomas Arendsen Hein <thomas@intevation.de> parents: 6217 diff changeset	3614 very useful to compare different revisions, to go back to significant
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3615 earlier versions or to mark branch points as releases, etc.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3616
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3617 If no revision is given, the parent of the working directory is
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3618 used, or tip if no revision is checked out.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3619
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3620 To facilitate version control, distribution, and merging of tags,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3621 they are stored as a file named ".hgtags" which is managed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3622 similarly to other project files and can be hand-edited if
6447 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6440 diff changeset	3623 necessary. The file '.hg/localtags' is used for local tags (not
1654 b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	3624 shared among repositories).
6163 1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	3625
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3626 See :hg:`help dates` for a list of formats valid for -d/--date.
11063 eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11061 diff changeset	3627
eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11061 diff changeset	3628 Since tag names have priority over branch names during revision
eb23c876c111 tag: warn users about tag/branch possible name conflicts Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11061 diff changeset	3629 lookup, using an existing branch name as a tag name is discouraged.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3630
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3631 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3632 """
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3633
6741 c9fbd6ec3489 context: avoid using None for working parent Matt Mackall <mpm@selenic.com> parents: 6723 diff changeset	3634 rev_ = "."
11169 3d0a9c8d7184 tag: strip whitespace from tag names (issue2174) Matt Mackall <mpm@selenic.com> parents: 11165 diff changeset	3635 names = [t.strip() for t in (name1,) + names]
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	3636 if len(names) != len(set(names)):
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3637 raise util.Abort(_('tag names must be unique'))
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3638 for n in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3639 if n in ['tip', '.', 'null']:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3640 raise util.Abort(_('the name \'%s\' is reserved') % n)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3641 if opts.get('rev') and opts.get('remove'):
4217 3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	3642 raise util.Abort(_("--rev and --remove are incompatible"))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3643 if opts.get('rev'):
1596 41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	3644 rev_ = opts['rev']
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3645 message = opts.get('message')
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3646 if opts.get('remove'):
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3647 expectedtype = opts.get('local') and 'local' or 'global'
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3648 for n in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3649 if not repo.tagtype(n):
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3650 raise util.Abort(_('tag \'%s\' does not exist') % n)
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3651 if repo.tagtype(n) != expectedtype:
8008 36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3652 if expectedtype == 'global':
36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3653 raise util.Abort(_('tag \'%s\' is not a global tag') % n)
36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3654 else:
36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3655 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
4217 3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	3656 rev_ = nullid
3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4207 diff changeset	3657 if not message:
9186 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9136 diff changeset	3658 # we don't translate commit messages
d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9136 diff changeset	3659 message = 'Removed tag %s' % ', '.join(names)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3660 elif not opts.get('force'):
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3661 for n in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3662 if n in repo.tags():
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3663 raise util.Abort(_('tag \'%s\' already exists '
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3664 '(use -f to force)') % n)
3127 81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	3665 if not rev_ and repo.dirstate.parents()[1] != nullid:
81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	3666 raise util.Abort(_('uncommitted merge - please provide a '
81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3092 diff changeset	3667 'specific revision'))
6749 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	3668 r = repo[rev_].node()
2974 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2973 diff changeset	3669
eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2973 diff changeset	3670 if not message:
9186 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9136 diff changeset	3671 # we don't translate commit messages
d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9136 diff changeset	3672 message = ('Added tag %s for changeset %s' %
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3673 (', '.join(names), short(r)))
2974 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2973 diff changeset	3674
6243 437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3675 date = opts.get('date')
437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3676 if date:
437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3677 date = util.parsedate(date)
437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3678
11185 6d7cf82453be tag: add -e/--edit option for modifying the commit message Steve Losh <steve@stevelosh.com> parents: 11181 diff changeset	3679 if opts.get('edit'):
6d7cf82453be tag: add -e/--edit option for modifying the commit message Steve Losh <steve@stevelosh.com> parents: 11181 diff changeset	3680 message = ui.edit(message, ui.username())
6d7cf82453be tag: add -e/--edit option for modifying the commit message Steve Losh <steve@stevelosh.com> parents: 11181 diff changeset	3681
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3682 repo.tag(names, r, message, opts.get('local'), opts.get('user'), date)
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	3683
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	3684 def tags(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3685 """list repository tags
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3686
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3687 This lists both regular and local tags. When the -v/--verbose
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3688 switch is used, a third column "local" is printed for local tags.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3689
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3690 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3691 """
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	3692
2973 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2963 diff changeset	3693 hexfunc = ui.debugflag and hex or short
5662 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3694 tagtype = ""
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3695
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	3696 for t, n in reversed(repo.tagslist()):
5662 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3697 if ui.quiet:
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3698 ui.write("%s\n" % t)
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3699 continue
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3700
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	3701 try:
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4505 diff changeset	3702 hn = hexfunc(n)
5662 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3703 r = "%5d:%s" % (repo.changelog.rev(n), hn)
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7632 diff changeset	3704 except error.LookupError:
3930 01d98d68d697 Add revlog.LookupError exception, and use it instead of RevlogError. Brendan Cully <brendan@kublai.com> parents: 3919 diff changeset	3705 r = " ?:%s" % hn
2035 107dc72880f8 Make 'hg tags -q' only list tag names without revision numbers and hashes, Thomas Arendsen Hein <thomas@intevation.de> parents: 2034 diff changeset	3706 else:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	3707 spaces = " " * (30 - encoding.colwidth(t))
5662 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3708 if ui.verbose:
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3709 if repo.tagtype(t) == 'local':
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3710 tagtype = " local"
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3711 else:
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3712 tagtype = ""
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5661 diff changeset	3713 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	3714
1731 251729df9cc6 add -p option to tip. for issue 64. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1728 diff changeset	3715 def tip(ui, repo, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3716 """show the tip revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3717
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3718 The tip revision (usually just called the tip) is the changeset
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3719 most recently added to the repository (and therefore the most
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3720 recently changed head).
6364 b22b39059722 Make tip help more helpful Patrick Mezard <pmezard@gmail.com> parents: 6353 diff changeset	3721
6367 51984a2413f2 Remove unexpected "Alternately" word from tip help. Patrick Mezard <pmezard@gmail.com> parents: 6364 diff changeset	3722 If you have just made a commit, that commit will be the tip. If
51984a2413f2 Remove unexpected "Alternately" word from tip help. Patrick Mezard <pmezard@gmail.com> parents: 6364 diff changeset	3723 you have just pulled changes from another repository, the tip of
51984a2413f2 Remove unexpected "Alternately" word from tip help. Patrick Mezard <pmezard@gmail.com> parents: 6364 diff changeset	3724 that repository becomes the current tip. The "tip" tag is special
51984a2413f2 Remove unexpected "Alternately" word from tip help. Patrick Mezard <pmezard@gmail.com> parents: 6364 diff changeset	3725 and cannot be renamed or assigned to a different changeset.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3726
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3727 Returns 0 on success.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3728 """
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	3729 displayer = cmdutil.show_changeset(ui, repo, opts)
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	3730 displayer.show(repo[len(repo) - 1])
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	3731 displayer.close()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	3732
4699 a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3733 def unbundle(ui, repo, fname1, fnames, *opts):
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3734 """apply one or more changegroup files
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3735
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3736 Apply one or more compressed changegroup files generated by the
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3737 bundle command.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3738
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3739 Returns 0 on success, 1 if an update has unresolved files.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3740 """
4699 a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3741 fnames = (fname1,) + fnames
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3742
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	3743 lock = repo.lock()
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3744 try:
d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3745 for fname in fnames:
7271 8046f0a070a6 use our urlopener (proxy handling, etc) instead of urllib Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7270 diff changeset	3746 f = url.open(ui, fname)
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3747 gen = changegroup.readbundle(f, fname)
11442 ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11384 diff changeset	3748 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname,
ee1ed6afac21 addchangegroup: pass in lock to release it before changegroup hook is called Matt Mackall <mpm@selenic.com> parents: 11384 diff changeset	3749 lock=lock)
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3750 finally:
8104 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8087 diff changeset	3751 lock.release()
4699 a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3752
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3753 return postincoming(ui, repo, modheads, opts.get('update'), None)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3754
8855 f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3755 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
10889 e25c450c351e commands: improve some command summaries Matt Mackall <mpm@selenic.com> parents: 10882 diff changeset	3756 """update working directory (or switch revisions)
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3757
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3758 Update the repository's working directory to the specified
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3759 changeset.
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3760
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3761 If no changeset is specified, attempt to update to the head of the
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3762 current branch. If this head is a descendant of the working
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3763 directory's parent, update to it, otherwise abort.
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3764
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3765 The following rules apply when the working directory contains
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3766 uncommitted changes:
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3767
9831 9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3768 1. If neither -c/--check nor -C/--clean is specified, and if
9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3769 the requested changeset is an ancestor or descendant of
9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3770 the working directory's parent, the uncommitted changes
9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3771 are merged into the requested changeset and the merged
9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3772 result is left uncommitted. If the requested changeset is
9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3773 not an ancestor or descendant (that is, it is on another
9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3774 branch), the update is aborted and the uncommitted changes
9740 2ebe679fec21 commands: use enumerated lists in help texts Martin Geisler <mg@lazybytes.net> parents: 9734 diff changeset	3775 are preserved.
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3776
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3777 2. With the -c/--check option, the update is aborted and the
9740 2ebe679fec21 commands: use enumerated lists in help texts Martin Geisler <mg@lazybytes.net> parents: 9734 diff changeset	3778 uncommitted changes are preserved.
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3779
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3780 3. With the -C/--clean option, uncommitted changes are discarded and
9740 2ebe679fec21 commands: use enumerated lists in help texts Martin Geisler <mg@lazybytes.net> parents: 9734 diff changeset	3781 the working directory is updated to the requested changeset.
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3782
10973 49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3783 Use null as the changeset to remove the working directory (like
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3784 :hg:`clone -U`).
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3785
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3786 If you want to update just one file to an older changeset, use :hg:`revert`.
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3787
49a07f441496 Use hg role in help strings Martin Geisler <mg@aragost.com> parents: 10963 diff changeset	3788 See :hg:`help dates` for a list of formats valid for -d/--date.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3789
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3790 Returns 0 on success, 1 if there are unresolved files.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3791 """
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3792 if rev and node:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3793 raise util.Abort(_("please specify just one revision"))
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3794
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3795 if not rev:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3796 rev = node
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3797
9452 e78967d3dd6f commands: forbid 'hg update --check --clean' Stuart W Marks <smarks@smarks.org> parents: 9429 diff changeset	3798 if check and clean:
9454 3e673c988c85 commands: expand -c and -C in update error message Martin Geisler <mg@lazybytes.net> parents: 9452 diff changeset	3799 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
9452 e78967d3dd6f commands: forbid 'hg update --check --clean' Stuart W Marks <smarks@smarks.org> parents: 9429 diff changeset	3800
e78967d3dd6f commands: forbid 'hg update --check --clean' Stuart W Marks <smarks@smarks.org> parents: 9429 diff changeset	3801 if check:
8855 f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3802 # we could use dirty() but we can ignore merge and branch trivia
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3803 c = repo[None]
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3804 if c.modified() or c.added() or c.removed():
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3805 raise util.Abort(_("uncommitted local changes"))
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3806
3818 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3807 if date:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3808 if rev:
3818 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3809 raise util.Abort(_("you can't specify a revision and a date"))
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3810 rev = cmdutil.finddate(ui, repo, date)
3818 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3816 diff changeset	3811
9213 7bb1dbfd3082 update: allow -c to jump branches if clean Matt Mackall <mpm@selenic.com> parents: 9136 diff changeset	3812 if clean or check:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3813 return hg.clean(repo, rev)
2822 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2820 diff changeset	3814 else:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	3815 return hg.update(repo, rev)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	3816
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	3817 def verify(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3818 """verify the integrity of the repository
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3819
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3820 Verify the integrity of the current repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3821
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3822 This will perform an extensive check of the repository's
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3823 integrity, validating the hashes and checksums of each entry in
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3824 the changelog, manifest, and tracked files, as well as the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3825 integrity of their crosslinks and indices.
11177 6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3826
6a64813276ed commands: initial audit of exit codes Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	3827 Returns 0 on success, 1 if errors are encountered.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3828 """
2802 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2800 diff changeset	3829 return hg.verify(repo)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	3830
3658 6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3831 def version_(ui):
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3832 """output version and copyright information"""
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3833 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7632 9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7628 diff changeset	3834 % util.version())
3658 6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3835 ui.status(_(
10206 8b5ca9b9b435 commands: update copyright year to 2010 Martin Geisler <mg@lazybytes.net> parents: 9970 diff changeset	3836 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3658 6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3837 "This is free software; see the source for copying conditions. "
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3838 "There is NO\nwarranty; "
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3839 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3840 ))
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	3841
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	3842 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	3843
3180 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3844 globalopts = [
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3845 ('R', 'repository', '',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3846 _('repository root directory or name of overlay bundle file'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3847 _('REPO')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3848 ('', 'cwd', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3849 _('change working directory'), _('DIR')),
3180 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3850 ('y', 'noninteractive', None,
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3851 _('do not prompt, assume \'yes\' for any required answers')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3852 ('q', 'quiet', None, _('suppress output')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3853 ('v', 'verbose', None, _('enable additional output')),
10541 fac67f0bfbb2 commands: clarify --config syntax Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10527 diff changeset	3854 ('', 'config', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3855 _('set/override config option (use \'section.name=value\')'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3856 _('CONFIG')),
3180 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3857 ('', 'debug', None, _('enable debugging output')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3858 ('', 'debugger', None, _('start debugger')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3859 ('', 'encoding', encoding.encoding, _('set the charset encoding'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3860 _('ENCODE')),
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	3861 ('', 'encodingmode', encoding.encodingmode,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3862 _('set the charset encoding mode'), _('MODE')),
9698 3bbc6bc62809 commands: slightly better help for --traceback Martin Geisler <mg@lazybytes.net> parents: 9689 diff changeset	3863 ('', 'traceback', None, _('always print a traceback on exception')),
3180 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3864 ('', 'time', None, _('time how long the command takes')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3865 ('', 'profile', None, _('print command execution profile')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3866 ('', 'version', None, _('output version information and exit')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3867 ('h', 'help', None, _('display help and exit')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3868 ]
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3174 diff changeset	3869
3182 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3870 dryrunopts = [('n', 'dry-run', None,
a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3871 _('do not perform actions, just print output'))]
a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3872
3183 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3182 diff changeset	3873 remoteopts = [
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3874 ('e', 'ssh', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3875 _('specify ssh command to use'), _('CMD')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3876 ('', 'remotecmd', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3877 _('specify hg command to run on the remote side'), _('CMD')),
3183 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3182 diff changeset	3878 ]
37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3182 diff changeset	3879
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	3880 walkopts = [
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3881 ('I', 'include', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3882 _('include names matching the given patterns'), _('PATTERN')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3883 ('X', 'exclude', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3884 _('exclude names matching the given patterns'), _('PATTERN')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	3885 ]
725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	3886
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3887 commitopts = [
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3888 ('m', 'message', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3889 _('use text as commit message'), _('TEXT')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3890 ('l', 'logfile', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3891 _('read commit message from file'), _('FILE')),
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3892 ]
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3893
5122 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	3894 commitopts2 = [
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3895 ('d', 'date', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3896 _('record datecode as commit date'), _('DATE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3897 ('u', 'user', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3898 _('record the specified user as committer'), _('USER')),
5122 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	3899 ]
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	3900
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3901 templateopts = [
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3902 ('', 'style', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3903 _('display using template map file'), _('STYLE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3904 ('', 'template', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3905 _('display with template'), _('TEMPLATE')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3906 ]
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3907
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3908 logopts = [
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3909 ('p', 'patch', None, _('show patch')),
7763 cdc913e7fc5f log-like commands now use -G for --graph, -g for --git Jim Correia <jim.correia@pobox.com> parents: 7762 diff changeset	3910 ('g', 'git', None, _('use git extended diff format')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3911 ('l', 'limit', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3912 _('limit number of changes displayed'), _('NUM')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3913 ('M', 'no-merges', None, _('do not show merges')),
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 11050 diff changeset	3914 ('', 'stat', None, _('output diffstat-style summary of changes')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3915 ] + templateopts
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3916
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3917 diffopts = [
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3918 ('a', 'text', None, _('treat all files as text')),
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3919 ('g', 'git', None, _('use git extended diff format')),
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3920 ('', 'nodates', None, _('omit dates from diff headers'))
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3921 ]
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3922
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3923 diffopts2 = [
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3924 ('p', 'show-function', None, _('show which function each change is in')),
9857 24bc6e414610 diff: change --inverse to --reverse Martin Geisler <mg@lazybytes.net> parents: 9839 diff changeset	3925 ('', 'reverse', None, _('produce a diff that undoes the changes')),
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3926 ('w', 'ignore-all-space', None,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3927 _('ignore white space when comparing lines')),
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3928 ('b', 'ignore-space-change', None,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3929 _('ignore changes in the amount of white space')),
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3930 ('B', 'ignore-blank-lines', None,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3931 _('ignore changes whose lines are all blank')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3932 ('U', 'unified', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3933 _('number of lines of context to show'), _('NUM')),
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	3934 ('', 'stat', None, _('output diffstat-style summary of changes')),
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3935 ]
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	3936
7400 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3937 similarityopts = [
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3938 ('s', 'similarity', '',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3939 _('guess renamed files by similarity (0<=s<=100)'), _('SIMILARITY'))
7400 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3940 ]
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3941
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3942 table = {
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3943 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
2955 9d1c3529ebbc addremove: do not deprecate. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2639 diff changeset	3944 "addremove":
7400 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3945 (addremove, similarityopts + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3946 _('[OPTION]... [FILE]...')),
6182 07f2236c4dee add a blame alias for annotate Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6180 diff changeset	3947 "^annotate\|blame":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3948 (annotate,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3949 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3950 _('annotate the specified revision'), _('REV')),
10579 f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	3951 ('', 'follow', None,
f142fa3c0a8c Make annotate --follow an alias for -f/--file to behave like in older versions Thomas Arendsen Hein <thomas@intevation.de> parents: 10564 diff changeset	3952 _('follow copies/renames and list the filename (DEPRECATED)')),
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	3953 ('', 'no-follow', None, _("don't follow copies and renames")),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	3954 ('a', 'text', None, _('treat all files as text')),
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	3955 ('u', 'user', None, _('list the author (long with -v)')),
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	3956 ('f', 'file', None, _('list the filename')),
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	3957 ('d', 'date', None, _('list the date (short with -q)')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3958 ('n', 'number', None, _('list the revision number (default)')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3959 ('c', 'changeset', None, _('list the changeset')),
4847 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	3960 ('l', 'line-number', None,
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4836 diff changeset	3961 _('show line number at the first appearance'))
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	3962 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3963 _('[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...')),
2160 858df1f354c1 Cleanup archive command: Don't overwrite gettext, quoting in cmd table entry. Thomas Arendsen Hein <thomas@intevation.de> parents: 2159 diff changeset	3964 "archive":
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3965 (archive,
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3966 [('', 'no-decode', None, _('do not pass files through decoders')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3967 ('p', 'prefix', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3968 _('directory prefix for files in archive'), _('PREFIX')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3969 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3970 _('revision to distribute'), _('REV')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3971 ('t', 'type', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3972 _('type of distribution to create'), _('TYPE')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	3973 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3974 _('[OPTION]... DEST')),
2159 5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	3975 "backout":
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	3976 (backout,
2159 5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	3977 [('', 'merge', None,
5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	3978 _('merge with old dirstate parent after backout')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3979 ('', 'parent', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3980 _('parent to choose when backing out merge'), _('REV')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3981 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3982 _('revision to backout'), _('REV')),
5122 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	3983 ] + walkopts + commitopts + commitopts2,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3984 _('[OPTION]... [-r] REV')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3985 "bisect":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3986 (bisect,
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3987 [('r', 'reset', False, _('reset bisect state')),
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3988 ('g', 'good', False, _('mark changeset good')),
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3989 ('b', 'bad', False, _('mark changeset bad')),
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3990 ('s', 'skip', False, _('skip testing changeset')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3991 ('c', 'command', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	3992 _('use command to check changeset state'), _('CMD')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3993 ('U', 'noupdate', False, _('do not update to target'))],
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	3994 _("[-gbsr] [-U] [-c CMD] [REV]")),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3995 "branch":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3996 (branch,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3997 [('f', 'force', None,
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	3998 _('set branch name even if it shadows an existing branch')),
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	3999 ('C', 'clean', None, _('reset branch name to parent branch name'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4000 _('[-fC] [NAME]')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	4001 "branches":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	4002 (branches,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	4003 [('a', 'active', False,
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	4004 _('show only branches that have unmerged heads')),
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	4005 ('c', 'closed', False,
9215 c2041f80f22a heads: more clarity for --closed Matt Mackall <mpm@selenic.com> parents: 9214 diff changeset	4006 _('show normal and closed branches'))],
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	4007 _('[-ac]')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	4008 "bundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	4009 (bundle,
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	4010 [('f', 'force', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	4011 _('run even when the destination is unrelated')),
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	4012 ('r', 'rev', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4013 _('a changeset intended to be added to the destination'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4014 _('REV')),
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	4015 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4016 _('a specific branch you would like to bundle'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4017 _('BRANCH')),
3283 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3277 diff changeset	4018 ('', 'base', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4019 _('a base changeset assumed to be available at the destination'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4020 _('REV')),
6570 626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	4021 ('a', 'all', None, _('bundle all changesets in the repository')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4022 ('t', 'type', 'bzip2',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4023 _('bundle compression type to use'), _('TYPE')),
3184 545b6d718593 add remoteopts to bundle command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3183 diff changeset	4024 ] + remoteopts,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	4025 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4026 "cat":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4027 (cat,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4028 [('o', 'output', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4029 _('print output to file with formatted name'), _('FORMAT')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4030 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4031 _('print the given revision'), _('REV')),
6094 3998c1b0828f cat --decode: Drop short option, use opts.get() instead of opts[] Thomas Arendsen Hein <thomas@intevation.de> parents: 6093 diff changeset	4032 ('', 'decode', None, _('apply any matching decode filter')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	4033 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4034 _('[OPTION]... FILE...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4035 "^clone":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4036 (clone,
6625 4d3a60d5c490 improve help text for clone -U Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6620 diff changeset	4037 [('U', 'noupdate', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	4038 _('the clone will include an empty working copy (only a repository)')),
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	4039 ('u', 'updaterev', '',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4040 _('revision, tag or branch to check out'), _('REV')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4041 ('r', 'rev', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4042 _('include the specified changeset'), _('REV')),
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	4043 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4044 _('clone only the specified branch'), _('BRANCH')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	4045 ('', 'pull', None, _('use pull protocol to copy metadata')),
2620 de82749d3a71 clone: change name of --stream to --uncompressed. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2618 diff changeset	4046 ('', 'uncompressed', None,
de82749d3a71 clone: change name of --stream to --uncompressed. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2618 diff changeset	4047 _('use uncompressed transfer (fast over LAN)')),
3183 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3182 diff changeset	4048 ] + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4049 _('[OPTION]... SOURCE [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4050 "^commit\|ci":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4051 (commit,
2184 2477a7183a6f Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'. Thomas Arendsen Hein <thomas@intevation.de> parents: 2181 diff changeset	4052 [('A', 'addremove', None,
2477a7183a6f Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'. Thomas Arendsen Hein <thomas@intevation.de> parents: 2181 diff changeset	4053 _('mark new/missing files as added/removed before committing')),
7655 cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	4054 ('', 'close-branch', None,
cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	4055 _('mark a branch as closed, hiding it from the branch list')),
5122 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	4056 ] + walkopts + commitopts + commitopts2,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4057 _('[OPTION]... [FILE]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4058 "copy\|cp":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4059 (copy,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	4060 [('A', 'after', None, _('record a copy that has already occurred')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4061 ('f', 'force', None,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	4062 _('forcibly copy over an existing managed file')),
3182 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	4063 ] + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4064 _('[OPTION]... [SOURCE]... DEST')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4065 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
11337 0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4066 "debugbuilddag":
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4067 (debugbuilddag,
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4068 [('m', 'mergeable-file', None, _('add single file mergeable changes')),
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4069 ('a', 'appended-file', None, _('add single file all revs append to')),
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4070 ('o', 'overwritten-file', None, _('add single file all revs overwrite')),
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4071 ('n', 'new-file', None, _('add new file at each rev')),
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4072 ],
0f3c8a47960e debugbuilddag: build a changelog dag from a concise description Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11336 diff changeset	4073 _('[OPTION]... TEXT')),
9614 fcc85abc762e commands: fix missing empty synopses Matt Mackall <mpm@selenic.com> parents: 9603 diff changeset	4074 "debugcheckstate": (debugcheckstate, [], ''),
7879 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	4075 "debugcommands": (debugcommands, [], _('[COMMAND]')),
2034 5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	4076 "debugcomplete":
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	4077 (debugcomplete,
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	4078 [('o', 'options', None, _('show the command options'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4079 _('[-o] CMD')),
11336 3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4080 "debugdag":
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4081 (debugdag,
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4082 [('t', 'tags', None, _('use tags as labels')),
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4083 ('b', 'branches', None, _('annotate with branch names')),
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4084 ('', 'dots', None, _('use dots for runs')),
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4085 ('s', 'spaces', None, _('separate elements by spaces')),
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4086 ],
3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4087 _('[OPTION]... [FILE [REV]...]')),
5781 45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4088 "debugdate":
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4089 (debugdate,
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4090 [('e', 'extended', None, _('try extended date formats'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4091 _('[-e] DATE [RANGE]')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4092 "debugdata": (debugdata, [], _('FILE REV')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4093 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4094 "debugindex": (debugindex, [], _('FILE')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4095 "debugindexdot": (debugindexdot, [], _('FILE')),
9614 fcc85abc762e commands: fix missing empty synopses Matt Mackall <mpm@selenic.com> parents: 9603 diff changeset	4096 "debuginstall": (debuginstall, [], ''),
11371 4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	4097 "debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	4098 "debugrebuildstate":
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	4099 (debugrebuildstate,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4100 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4101 _('revision to rebuild to'), _('REV'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4102 _('[-r REV] [REV]')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	4103 "debugrename":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	4104 (debugrename,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4105 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4106 _('revision to debug'), _('REV'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4107 _('[-r REV] FILE')),
11276 f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	4108 "debugrevspec":
f28b58e35768 revset: add a debugrevspec command Matt Mackall <mpm@selenic.com> parents: 11273 diff changeset	4109 (debugrevspec, [], ('REVSPEC')),
5781 45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4110 "debugsetparents":
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4111 (debugsetparents, [], _('REV1 [REV2]')),
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	4112 "debugstate":
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	4113 (debugstate,
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	4114 [('', 'nodates', None, _('do not display the saved mtime'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4115 _('[OPTION]...')),
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	4116 "debugsub":
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	4117 (debugsub,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4118 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4119 _('revision to check'), _('REV'))],
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	4120 _('[-r REV] [REV]')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4121 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4122 "^diff":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4123 (diff,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4124 [('r', 'rev', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4125 _('revision'), _('REV')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4126 ('c', 'change', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4127 _('change made by revision'), _('REV'))
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	4128 ] + diffopts + diffopts2 + walkopts,
10520 75361931884d commands: mention diff -c timeless <timeless@mozdev.org> parents: 10515 diff changeset	4129 _('[OPTION]... ([-c REV] \| [-r REV1 [-r REV2]]) [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4130 "^export":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4131 (export,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4132 [('o', 'output', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4133 _('print output to file with formatted name'), _('FORMAT')),
10015 b5f352f33520 commands.export: accept -r option as revision specification Alexander Solovyov <piranha@piranha.org.ua> parents: 10014 diff changeset	4134 ('', 'switch-parent', None, _('diff against the second parent')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4135 ('r', 'rev', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4136 _('revisions to export'), _('REV')),
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6659 diff changeset	4137 ] + diffopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4138 _('[OPTION]... [-o OUTFILESPEC] REV...')),
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	4139 "^forget":
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	4140 (forget,
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	4141 [] + walkopts,
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	4142 _('[OPTION]... FILE...')),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	4143 "grep":
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	4144 (grep,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4145 [('0', 'print0', None, _('end fields with NUL')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	4146 ('', 'all', None, _('print all revisions that match')),
2869 8eaaf1321bfe grep: add --follow support. Brendan Cully <brendan@kublai.com> parents: 2868 diff changeset	4147 ('f', 'follow', None,
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4148 _('follow changeset history,'
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4149 ' or file history across copies and renames')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4150 ('i', 'ignore-case', None, _('ignore case when matching')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4151 ('l', 'files-with-matches', None,
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	4152 _('print only filenames and revisions that match')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	4153 ('n', 'line-number', None, _('print matching line numbers')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4154 ('r', 'rev', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4155 _('only search files changed within revision range'), _('REV')),
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	4156 ('u', 'user', None, _('list the author (long with -v)')),
7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	4157 ('d', 'date', None, _('list the date (short with -q)')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	4158 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4159 _('[OPTION]... PATTERN [FILE]...')),
905 65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	4160 "heads":
65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	4161 (heads,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4162 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4163 _('show only heads which are descendants of REV'), _('REV')),
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	4164 ('t', 'topo', False, _('show topological heads only')),
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	4165 ('a', 'active', False,
10326 8b90e2966219 commands: deprecate the heads -a option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10316 diff changeset	4166 _('show active branchheads only [DEPRECATED]')),
8695 9a89253a32e6 heads: show closed heads only when --closed is passed John Mulligan <phlogistonjohn@asynchrono.us> parents: 8680 diff changeset	4167 ('c', 'closed', False,
9215 c2041f80f22a heads: more clarity for --closed Matt Mackall <mpm@selenic.com> parents: 9214 diff changeset	4168 _('show normal and closed branch heads')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4169 ] + templateopts,
11180 4b02fc71bbba Fix hg heads -r flag documentation Ori Avtalion <ori@avtalion.name> parents: 11179 diff changeset	4170 _('[-ac] [-r REV] [REV]...')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4171 "help": (help_, [], _('[TOPIC]')),
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	4172 "identify\|id":
091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	4173 (identify,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4174 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4175 _('identify the specified revision'), _('REV')),
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	4176 ('n', 'num', None, _('show local revision number')),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	4177 ('i', 'id', None, _('show global revision id')),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	4178 ('b', 'branch', None, _('show branch')),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	4179 ('t', 'tags', None, _('show tags'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4180 _('[-nibt] [-r REV] [SOURCE]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4181 "import\|patch":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4182 (import_,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4183 [('p', 'strip', 1,
8038 2ee6769afe82 commands: removed bad linebreak in import help Martin Geisler <mg@lazybytes.net> parents: 8034 diff changeset	4184 _('directory strip option for patch. This has the same '
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4185 'meaning as the corresponding patch option'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4186 _('NUM')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4187 ('b', 'base', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4188 _('base path'), _('PATH')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4189 ('f', 'force', None,
4258 47ba52121433 Add import --exact. Brendan Cully <brendan@kublai.com> parents: 4256 diff changeset	4190 _('skip check for outstanding uncommitted changes')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4191 ('', 'no-commit', None,
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4192 _("don't commit, just update the working directory")),
4258 47ba52121433 Add import --exact. Brendan Cully <brendan@kublai.com> parents: 4256 diff changeset	4193 ('', 'exact', None,
4592 5243cece3d97 Add --import-branch option to hg import to pull in branch information without --exact Eric Hopper <hopper@omnifarious.org> parents: 4587 diff changeset	4194 _('apply patch to the nodes from which it was generated')),
5243cece3d97 Add --import-branch option to hg import to pull in branch information without --exact Eric Hopper <hopper@omnifarious.org> parents: 4587 diff changeset	4195 ('', 'import-branch', None,
8034 15725dbc900f commands: lower-case --import-branch help text Martin Geisler <mg@lazybytes.net> parents: 8033 diff changeset	4196 _('use any branch information in patch (implied by --exact)'))] +
7400 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	4197 commitopts + commitopts2 + similarityopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4198 _('[OPTION]... PATCH...')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	4199 "incoming\|in":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	4200 (incoming,
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4201 [('f', 'force', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	4202 _('run even if remote repository is unrelated')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	4203 ('n', 'newest-first', None, _('show newest record first')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4204 ('', 'bundle', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4205 _('file to store the bundles into'), _('FILE')),
6304 d99b4e8652b3 Make clear that for a changegroup '-r' pulls "up to" a revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6299 diff changeset	4206 ('r', 'rev', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4207 _('a remote changeset intended to be added'), _('REV')),
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	4208 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4209 _('a specific branch you would like to pull'), _('BRANCH')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4210 ] + logopts + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4211 _('[-p] [-n] [-M] [-f] [-r REV]...'
2544 0ab63318bc36 Added missing space in continued string. Thomas Arendsen Hein <thomas@intevation.de> parents: 2521 diff changeset	4212 ' [--bundle FILENAME] [SOURCE]')),
2598 b898afee9d0d Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out. Thomas Arendsen Hein <thomas@intevation.de> parents: 2597 diff changeset	4213 "^init":
3883 6081b4c68baf Corrected synopsis for many commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 3862 diff changeset	4214 (init,
6081b4c68baf Corrected synopsis for many commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 3862 diff changeset	4215 remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4216 _('[-e CMD] [--remotecmd CMD] [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4217 "locate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4218 (locate,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4219 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4220 _('search the repository as it is in REV'), _('REV')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4221 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4222 _('end filenames with NUL, for use with xargs')),
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4223 ('f', 'fullpath', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4224 _('print complete paths from the filesystem root')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	4225 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4226 _('[OPTION]... [PATTERN]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4227 "^log\|history":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4228 (log,
3885 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	4229 [('f', 'follow', None,
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4230 _('follow changeset history,'
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4231 ' or file history across copies and renames')),
2779 12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2778 diff changeset	4232 ('', 'follow-first', None,
12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2778 diff changeset	4233 _('only follow the first parent of merge changesets')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4234 ('d', 'date', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4235 _('show revisions matching date spec'), _('DATE')),
3190 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 3187 diff changeset	4236 ('C', 'copies', None, _('show copied files')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4237 ('k', 'keyword', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4238 _('do case-insensitive search for a given text'), _('TEXT')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4239 ('r', 'rev', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4240 _('show the specified revision or range'), _('REV')),
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	4241 ('', 'removed', None, _('include revisions where files were removed')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4242 ('m', 'only-merges', None, _('show only merges')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4243 ('u', 'user', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4244 _('revisions committed by user'), _('USER')),
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10934 diff changeset	4245 ('', 'only-branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4246 _('show only changesets within the given named branch (DEPRECATED)'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4247 _('BRANCH')),
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10934 diff changeset	4248 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4249 _('show changesets within the given named branch'), _('BRANCH')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4250 ('P', 'prune', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4251 _('do not display revision or any of its ancestors'), _('REV')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4252 ] + logopts + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4253 _('[OPTION]... [FILE]')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	4254 "manifest":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	4255 (manifest,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4256 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4257 _('revision to display'), _('REV'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4258 _('[-r REV]')),
4014 509342f95564 various doc fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4013 diff changeset	4259 "^merge":
2044 b343e7d454b4 Don't allow --style and --template for hg update and hg merge. Thomas Arendsen Hein <thomas@intevation.de> parents: 2043 diff changeset	4260 (merge,
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4442 diff changeset	4261 [('f', 'force', None, _('force a merge with outstanding changes')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4262 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4263 _('revision to merge'), _('REV')),
8834 6d36fc70754e merge: rename -S/--show option to -P/--preview Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8815 diff changeset	4264 ('P', 'preview', None,
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	4265 _('review revisions to merge (no merge is performed)'))],
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	4266 _('[-P] [-f] [[-r] REV]')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	4267 "outgoing\|out":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	4268 (outgoing,
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4269 [('f', 'force', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	4270 _('run even when the destination is unrelated')),
6304 d99b4e8652b3 Make clear that for a changegroup '-r' pulls "up to" a revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6299 diff changeset	4271 ('r', 'rev', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4272 _('a changeset intended to be included in the destination'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4273 _('REV')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	4274 ('n', 'newest-first', None, _('show newest record first')),
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	4275 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4276 _('a specific branch you would like to push'), _('BRANCH')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4277 ] + logopts + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4278 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
9616 69f8ac71ded1 Remove parents from default help in favor of summary Matt Mackall <mpm@selenic.com> parents: 9615 diff changeset	4279 "parents":
1724 5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	4280 (parents,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4281 [('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4282 _('show parents of the specified revision'), _('REV')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4283 ] + templateopts,
8544 48dd8a93d6db commands: standardize parents command meta data Ori Avtalion <ori@avtalion.name> parents: 8540 diff changeset	4284 _('[-r REV] [FILE]')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4285 "paths": (paths, [], _('[NAME]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4286 "^pull":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4287 (pull,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4288 [('u', 'update', None,
10210 43f8abcec42d commands: fix help string for pull -u and unbundle -u. Greg Ward <greg-hg@gerg.ca> parents: 10206 diff changeset	4289 _('update to new branch head if changesets were pulled')),
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	4290 ('f', 'force', None,
d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	4291 _('run even when remote repository is unrelated')),
3883 6081b4c68baf Corrected synopsis for many commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 3862 diff changeset	4292 ('r', 'rev', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4293 _('a remote changeset intended to be added'), _('REV')),
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	4294 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4295 _('a specific branch you would like to pull'), _('BRANCH')),
3183 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3182 diff changeset	4296 ] + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4297 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	4298 "^push":
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	4299 (push,
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4300 [('f', 'force', None, _('force push')),
6304 d99b4e8652b3 Make clear that for a changegroup '-r' pulls "up to" a revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6299 diff changeset	4301 ('r', 'rev', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4302 _('a changeset intended to be included in the destination'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4303 _('REV')),
10378 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	4304 ('b', 'branch', [],
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4305 _('a specific branch you would like to push'), _('BRANCH')),
11211 e43c23d189a5 push: add --new-branch option to allow intial push of new branches Sune Foldager <cryo@cyanite.org> parents: 11193 diff changeset	4306 ('', 'new-branch', False, _('allow pushing a new branch')),
3183 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3182 diff changeset	4307 ] + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4308 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4309 "recover": (recover, []),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4310 "^remove\|rm":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4311 (remove,
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	4312 [('A', 'after', None, _('record delete for missing files')),
8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	4313 ('f', 'force', None,
6347 3b42f7ac6916 tiny tab cleanup Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6346 diff changeset	4314 _('remove (and delete) file even if added or modified')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	4315 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4316 _('[OPTION]... FILE...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4317 "rename\|mv":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4318 (rename,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	4319 [('A', 'after', None, _('record a rename that has already occurred')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4320 ('f', 'force', None,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	4321 _('forcibly copy over an existing managed file')),
3182 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	4322 ] + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4323 _('[OPTION]... SOURCE... DEST')),
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	4324 "resolve":
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	4325 (resolve,
9747 85a3285860d3 hg help resolve grossly mischaracterizes the --all switch timeless@mozdev.org parents: 9740 diff changeset	4326 [('a', 'all', None, _('select all unresolved files')),
7534 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	4327 ('l', 'list', None, _('list state of files needing merge')),
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6508 diff changeset	4328 ('m', 'mark', None, _('mark files as resolved')),
9646 5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	4329 ('u', 'unmark', None, _('unmark files as resolved')),
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	4330 ('n', 'no-status', None, _('hide status prefix'))]
7765 da9acc68b1dd resolve: accepts walkopts (-I and -X) Simon Heimberg <simohe@besonet.ch> parents: 7763 diff changeset	4331 + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4332 _('[OPTION]... [FILE]...')),
5614 d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5613 diff changeset	4333 "revert":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4334 (revert,
2966 3b7626b861f8 revert: add -a as alias for --all Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2965 diff changeset	4335 [('a', 'all', None, _('revert all changes when no arguments given')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4336 ('d', 'date', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4337 _('tipmost revision matching date'), _('DATE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4338 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4339 _('revert to the specified revision'), _('REV')),
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	4340 ('', 'no-backup', None, _('do not save backup copies of files')),
3182 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	4341 ] + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4342 _('[OPTION]... [-r REV] [NAME]...')),
10882 f0bfe42c7b1f rollback: add dry-run argument, emit transaction description Steve Borho <steve@borho.org> parents: 10835 diff changeset	4343 "rollback": (rollback, dryrunopts),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4344 "root": (root, []),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4345 "^serve":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4346 (serve,
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4347 [('A', 'accesslog', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4348 _('name of access log file to write to'), _('FILE')),
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	4349 ('d', 'daemon', None, _('run server in background')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4350 ('', 'daemon-pipefds', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4351 _('used internally by daemon mode'), _('NUM')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4352 ('E', 'errorlog', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4353 _('name of error log file to write to'), _('FILE')),
10635 27027bee318e serve: fix port config Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10632 diff changeset	4354 # use string type, then we can check if something was passed
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4355 ('p', 'port', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4356 _('port to listen on (default: 8000)'), _('PORT')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4357 ('a', 'address', '',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4358 _('address to listen on (default: all interfaces)'), _('ADDR')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	4359 ('', 'prefix', '',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4360 _('prefix path to serve from (default: server root)'), _('PREFIX')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	4361 ('n', 'name', '',
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4362 _('name to show in web pages (default: working directory)'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4363 _('NAME')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4364 ('', 'web-conf', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4365 _('name of the hgweb config file (serve more than one repository)'),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4366 _('FILE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4367 ('', 'webdir-conf', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4368 _('name of the hgweb config file (DEPRECATED)'), _('FILE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4369 ('', 'pid-file', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4370 _('name of file to write process ID to'), _('FILE')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4371 ('', 'stdio', None, _('for remote clients')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4372 ('t', 'templates', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4373 _('web templates to use'), _('TEMPLATE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4374 ('', 'style', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4375 _('template style to use'), _('STYLE')),
4850 f3802f9f1840 Add SSL support to hg serve, activated via --certificate option Brendan Cully <brendan@kublai.com> parents: 4847 diff changeset	4376 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4377 ('', 'certificate', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4378 _('SSL certificate file'), _('FILE'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4379 _('[OPTION]...')),
5781 45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4380 "showconfig\|debugconfig":
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4381 (showconfig,
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	4382 [('u', 'untrusted', None, _('show untrusted configuration options'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4383 _('[-u] [NAME]...')),
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9590 diff changeset	4384 "^summary\|sum":
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	4385 (summary,
9628 022b15b9ec8c summary: remove reference to -p Matt Mackall <mpm@selenic.com> parents: 9620 diff changeset	4386 [('', 'remote', None, _('check for push and pull'))], '[--remote]'),
1507 cd8fadd8c689 Add explicit 'st' alias for status Matt Mackall <mpm@selenic.com> parents: 1506 diff changeset	4387 "^status\|st":
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	4388 (status,
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2639 diff changeset	4389 [('A', 'all', None, _('show status of all files')),
5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2639 diff changeset	4390 ('m', 'modified', None, _('show only modified files')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4391 ('a', 'added', None, _('show only added files')),
9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4392 ('r', 'removed', None, _('show only removed files')),
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	4393 ('d', 'deleted', None, _('show only deleted (but tracked) files')),
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2639 diff changeset	4394 ('c', 'clean', None, _('show only files without changes')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4395 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
4156 30857b5779f8 Fix help text for hg status -i Thomas Arendsen Hein <thomas@intevation.de> parents: 4143 diff changeset	4396 ('i', 'ignored', None, _('show only ignored files')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	4397 ('n', 'no-status', None, _('hide status prefix')),
2639 001703ec311d Add an option '-C\|--copies' to hg status to show the source of copied files. Brendan Cully <brendan@kublai.com> parents: 2630 diff changeset	4398 ('C', 'copies', None, _('show source of copied files')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4399 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	4400 _('end filenames with NUL, for use with xargs')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4401 ('', 'rev', [],
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4402 _('show difference from revision'), _('REV')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4403 ('', 'change', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4404 _('list the changed files of a revision'), _('REV')),
3181 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3180 diff changeset	4405 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4406 _('[OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4407 "tag":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4408 (tag,
4273 8185a1ca8628 tags: require -f to replace an existing tag Matt Mackall <mpm@selenic.com> parents: 4249 diff changeset	4409 [('f', 'force', None, _('replace existing tag')),
8185a1ca8628 tags: require -f to replace an existing tag Matt Mackall <mpm@selenic.com> parents: 4249 diff changeset	4410 ('l', 'local', None, _('make the tag local')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4411 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4412 _('revision to tag'), _('REV')),
5122 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	4413 ('', 'remove', None, _('remove a tag')),
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	4414 # -l/--local is already there, commitopts cannot be used
11185 6d7cf82453be tag: add -e/--edit option for modifying the commit message Steve Losh <steve@stevelosh.com> parents: 11181 diff changeset	4415 ('e', 'edit', None, _('edit commit message')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4416 ('m', 'message', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4417 _('use <text> as commit message'), _('TEXT')),
5122 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5098 diff changeset	4418 ] + commitopts2,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	4419 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
9614 fcc85abc762e commands: fix missing empty synopses Matt Mackall <mpm@selenic.com> parents: 9603 diff changeset	4420 "tags": (tags, [], ''),
1762 8eaa8e06a364 Add option -b/--branch to hg tip (as done for hg parents). Thomas Arendsen Hein <thomas@intevation.de> parents: 1761 diff changeset	4421 "tip":
8eaa8e06a364 Add option -b/--branch to hg tip (as done for hg parents). Thomas Arendsen Hein <thomas@intevation.de> parents: 1761 diff changeset	4422 (tip,
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4423 [('p', 'patch', None, _('show patch')),
7763 cdc913e7fc5f log-like commands now use -G for --graph, -g for --git Jim Correia <jim.correia@pobox.com> parents: 7762 diff changeset	4424 ('g', 'git', None, _('use git extended diff format')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	4425 ] + templateopts,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	4426 _('[-p] [-g]')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	4427 "unbundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	4428 (unbundle,
1601 a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	4429 [('u', 'update', None,
10210 43f8abcec42d commands: fix help string for pull -u and unbundle -u. Greg Ward <greg-hg@gerg.ca> parents: 10206 diff changeset	4430 _('update to new branch head if changesets were unbundled'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4431 _('[-u] FILE...')),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	4432 "^update\|up\|checkout\|co":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	4433 (update,
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	4434 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
8855 f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	4435 ('c', 'check', None, _('check for uncommitted changes')),
11321 40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4436 ('d', 'date', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4437 _('tipmost revision matching date'), _('DATE')),
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4438 ('r', 'rev', '',
40c06bbf58be help: show value requirement and multiple occurrence of options FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 11317 diff changeset	4439 _('revision'), _('REV'))],
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	4440 _('[-c] [-C] [-d DATE] [[-r] REV]')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4441 "verify": (verify, []),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	4442 "version": (version_, []),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	4443 }
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	4444
7879 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7874 diff changeset	4445 norepo = ("clone init version help debugcommands debugcomplete debugdata"
11371 4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	4446 " debugindex debugindexdot debugdate debuginstall debugfsinfo"
4c8842ee97ff pushkey: add debugpushkey command for testing Matt Mackall <mpm@selenic.com> parents: 11353 diff changeset	4447 " debugpushkey")
11336 3dfbe26cfded debugdag and debugindexdag: emit changelog/revlog DAGs as concise text Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 11331 diff changeset	4448 optionalrepo = ("identify paths serve showconfig debugancestor debugdag")

Mercurial > hg > mercurial-source

annotate mercurial/commands.py @ 11442:ee1ed6afac21 stable