mercurial-scm/hg-stable: mercurial/commands.py annotate

annotate mercurial/commands.py @ 11217:1b8aa9ffa7dc stable

commands: updates to push docstring. With contributions from mg, hstuart, timeless, and vsh.

author	Faheem Mitha <faheem@email.unc.edu>
date	Mon, 24 May 2010 21:52:33 +0530
parents	d29bd98ebff6
children	ffd59c71b8ee

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: 4614 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
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 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
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	13 import patch, help, mdiff, url, encoding, templatekw
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8287 diff changeset	14 import archival, changegroup, cmdutil, sshserver, hbisect
b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8287 diff changeset	15 from hgweb import server
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	16 import merge as merge_
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	17 import minirst
2731 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
3829 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3822 diff changeset	27 The files will be added to the repository at the next commit. To
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 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
7807 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
a565a2445eb5 commands: add verbose example to help text for add Martin Geisler <mg@lazybytes.net> parents: 10445 diff changeset	35 automatically by ``hg add``::
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
8679 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)
8679 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)
8679 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'):
8679 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	60 bad += [f for f in repo.add(names) if f in m.files()]
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):
3181 3637d5d17cbc Documentation fixes for addremove. Thomas Arendsen Hein <thomas@intevation.de> parents: 3172 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
9249 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.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	79 """
4966 8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4950 diff changeset	80 try:
8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4950 diff changeset	81 sim = float(opts.get('similarity') or 0)
8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4950 diff changeset	82 except ValueError:
8d982aef0be1 addremove: print meaningful error message if --similar not numeric Bryan O'Sullivan <bos@serpentine.com> parents: 4950 diff changeset	83 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	84 if sim < 0 or sim > 100:
ff3ea21a981a addremove: add -s/--similarity option Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2956 diff changeset	85 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	86 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	87
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	88 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	89 """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	90
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	91 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	92 each line
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	93
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	94 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	95 by whom.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	96
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	97 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	98 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	99 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	100 nor desirable.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	101 """
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	102 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	103 # --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	104 # 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	105 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	106
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	107 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	108 getdate = util.cachefunc(lambda x: datefunc(x[0].date()))
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	109
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	110 if not pats:
8761 0289f384e1e5 Generally replace "file name" with "filename" in help and comments. timeless <timeless@gmail.com> parents: 8760 diff changeset	111 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	112
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	113 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: 4849 diff changeset	114 ('number', lambda x: str(x[0].rev())),
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	115 ('changeset', lambda x: short(x[0].node())),
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	116 ('date', getdate),
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	117 ('file', lambda x: x[0].path()),
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	118 ]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	119
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	120 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	121 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	122 opts['number'] = 1
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	123
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	124 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	125 if linenumber and (not opts.get('changeset')) and (not opts.get('number')):
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	126 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: 4849 diff changeset	127
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	128 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: 4849 diff changeset	129 if linenumber:
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	130 lastfunc = funcmap[-1]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	131 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: 4849 diff changeset	132
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	133 ctx = repo[opts.get('rev')]
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	134 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	135 follow = not opts.get('no_follow')
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	136 for abs in ctx.walk(m):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	137 fctx = ctx[abs]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	138 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	139 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	140 continue
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	141
10369 98a0421b9e52 commands: annotate follows by default, separate -f/--file option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10365 diff changeset	142 lines = fctx.annotate(follow=follow, linenumber=linenumber)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	143 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	144
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	145 for f in funcmap:
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	146 l = [f(n) for n, dummy in lines]
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	147 if l:
7094 a4769dec7773 annotate: fix bug when annotating multiple files Matt Mackall <mpm@selenic.com> parents: 7040 diff changeset	148 ml = max(map(len, l))
a4769dec7773 annotate: fix bug when annotating multiple files Matt Mackall <mpm@selenic.com> parents: 7040 diff changeset	149 pieces.append(["%*s" % (ml, x) for x in l])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	150
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	151 if pieces:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	152 for p, l in zip(zip(*pieces), lines):
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	153 ui.write("%s: %s" % (" ".join(p), l[1]))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	154
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	155 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	156 '''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	157
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	158 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	159 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	160
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	161 To specify the type of archive to create, use -t/--type. Valid
9892 4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	162 types are:
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	163
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	164 :``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	165 :``tar``: tar archive, uncompressed
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	166 :``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	167 :``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	168 :``uzip``: zip archive, uncompressed
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	169 :``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	170
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	171 The exact name of the destination archive or directory is given
7974 a8a719ff150a commands: use single-quotes for 'hg help ...' hints Martin Geisler <mg@daimi.au.dk> parents: 7948 diff changeset	172 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	173
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	174 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	175 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	176 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	177 removed.
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	178 '''
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	179
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	180 ctx = repo[opts.get('rev')]
5061 a49f2a4d5ff7 archive: abort on empty repository. Fixes #624. Brendan Cully <brendan@kublai.com> parents: 4966 diff changeset	181 if not ctx:
7528 eadcc075967e archive: fix bogus error message with no working directory Matt Mackall <mpm@selenic.com> parents: 7527 diff changeset	182 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	183 node = ctx.node()
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2871 diff changeset	184 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	185 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	186 raise util.Abort(_('repository root cannot be destination'))
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	187 matchfn = cmdutil.match(repo, [], opts)
2476 0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	188 kind = opts.get('type') or 'files'
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	189 prefix = opts.get('prefix')
2476 0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	190 if dest == '-':
0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	191 if kind == 'files':
0f7e4a39d9af archive: make "hg archive -t XXX -" to write to stdout Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2473 diff changeset	192 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	193 dest = sys.stdout
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	194 if not prefix:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	195 prefix = os.path.basename(repo.root) + '-%h'
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2871 diff changeset	196 prefix = cmdutil.make_filename(repo, prefix, node)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	197 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	198 matchfn, prefix)
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	199
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	200 def backout(ui, repo, node=None, rev=None, **opts):
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	201 '''reverse effect of earlier changeset
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	202
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	203 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	204 changeset is a child of the backed out changeset.
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	205
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	206 If you backout a changeset other than the tip, a new head is
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	207 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	208 backout changeset with another head.
2254 827fcfe88b14 backout command: better help. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2245 diff changeset	209
827fcfe88b14 backout command: better help. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2245 diff changeset	210 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	211 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	212 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	213 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	214
8540 f0733f11b566 commands: remove unnecessary quotes in backout help Martin Geisler <mg@lazybytes.net> parents: 8533 diff changeset	215 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	216 '''
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	217 if rev and node:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	218 raise util.Abort(_("please specify just one revision"))
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	219
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	220 if not rev:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	221 rev = node
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	222
4726 f6e961c0155b Fix and test 'hg backout' without or with too many revisions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4718 diff changeset	223 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	224 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	225
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	226 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	227 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	228 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	229
4549 0c61124ad877 dispatch: move dispatching code to cmdutil Matt Mackall <mpm@selenic.com> parents: 4548 diff changeset	230 cmdutil.bail_if_changed(repo)
5716 be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5688 diff changeset	231 node = repo.lookup(rev)
be367cbafe70 cmdutil: make bail_if_changed bail on uncommitted merge Matt Mackall <mpm@selenic.com> parents: 5688 diff changeset	232
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	233 op1, op2 = repo.dirstate.parents()
5568 de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5542 diff changeset	234 a = repo.changelog.ancestor(op1, node)
de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5542 diff changeset	235 if a != node:
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	236 raise util.Abort(_('cannot backout change on a different branch'))
5568 de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5542 diff changeset	237
2614 8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	238 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	239 if p1 == nullid:
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	240 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	241 if p2 != nullid:
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	242 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	243 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	244 '--parent'))
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	245 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	246 if p not in (p1, p2):
3679 2956948b81f3 fix warnings generated by pygettext.py. Marcos Chaves <marcos.nospam@gmail.com> parents: 3673 diff changeset	247 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	248 (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	249 parent = p
8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	250 else:
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	251 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	252 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	253 parent = p1
5568 de620356064f backout: disallow across branches (issue655) Matt Mackall <mpm@selenic.com> parents: 5542 diff changeset	254
6423 fb374b1b3911 backout: reverse changeset belongs on current branch Matt Mackall <mpm@selenic.com> parents: 6385 diff changeset	255 # 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	256 branch = repo.dirstate.branch()
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2806 diff changeset	257 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	258 repo.dirstate.setbranch(branch)
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	259 revert_opts = opts.copy()
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	260 revert_opts['date'] = None
2982 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	261 revert_opts['all'] = True
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	262 revert_opts['rev'] = hex(parent)
6031 7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6030 diff changeset	263 revert_opts['no_backup'] = None
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	264 revert(ui, repo, **revert_opts)
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	265 commit_opts = opts.copy()
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	266 commit_opts['addremove'] = False
2159 5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	267 if not commit_opts['message'] and not commit_opts['logfile']:
9183 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9128 diff changeset	268 # we don't translate commit messages
9197 a05aa192a00a commands: remove ineffective parenthesis Martin Geisler <mg@lazybytes.net> parents: 9196 diff changeset	269 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	270 commit_opts['force_editor'] = True
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	271 commit(ui, repo, **commit_opts)
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	272 def nice(node):
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	273 return '%d:%s' % (repo.changelog.rev(node), short(node))
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	274 ui.status(_('changeset %s backs out changeset %s\n') %
ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	275 (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	276 if op1 != node:
6161 bc1ba9124799 Reverse the way backout is doing the merge Gilles Moris <gilles.moris@free.fr> parents: 6146 diff changeset	277 hg.clean(repo, op1, show_stats=False)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	278 if opts.get('merge'):
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	279 ui.status(_('merging with changeset %s\n')
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	280 % nice(repo.changelog.tip()))
6161 bc1ba9124799 Reverse the way backout is doing the merge Gilles Moris <gilles.moris@free.fr> parents: 6146 diff changeset	281 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	282 else:
9c660e691e90 print message after backout that tells that backout adds new head. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2482 diff changeset	283 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	284 '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	285 ui.status(_('(use "backout --merge" '
0aa458261901 fix hg backup option recommendation for auto-merge Christian Ebert <blacktrash@gmx.net> parents: 2760 diff changeset	286 'if you want to auto-merge)\n'))
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	287
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	288 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	289 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	290 """subdivision search of changesets
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	291
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	292 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	293 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	294 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	295 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	296 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	297 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	298 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	299 or announce that it has found the bad revision.
7184 380fda3eed13 clean up trailing spaces Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7037 diff changeset	300
6928 1a4c66d741a2 bisect: expand help text to explain REV argument and --noupdate Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6858 diff changeset	301 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	302 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	303
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	304 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	305 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	306 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	307 (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	308 non-zero exit status means the revision is bad.
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	309 """
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	310 def print_result(nodes, good):
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	311 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	312 if len(nodes) == 1:
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	313 # narrowed it down to a single revision
8088 bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	314 if good:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	315 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	316 else:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	317 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	318 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	319 else:
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	320 # multiple possible revisions
8088 bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	321 if good:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	322 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	323 "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	324 else:
bdeb380a10de commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8042 diff changeset	325 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	326 "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	327 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	328 displayer.show(repo[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	329 displayer.close()
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	330
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	331 def check_state(state, interactive=True):
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	332 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	333 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	334 return
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	335 if not state['good']:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	336 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	337 else:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	338 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	339 return True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	340
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	341 # backward compatibility
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	342 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	343 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	344 cmd, rev, extra = rev, extra, None
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	345 if cmd == "good":
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	346 good = True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	347 elif cmd == "bad":
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	348 bad = True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	349 else:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	350 reset = True
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	351 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	352 raise util.Abort(_('incompatible arguments'))
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	353
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	354 if reset:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	355 p = repo.join("bisect.state")
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	356 if os.path.exists(p):
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	357 os.unlink(p)
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	358 return
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	359
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	360 state = hbisect.load_state(repo)
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	361
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	362 if command:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	363 changesets = 1
7590 e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	364 try:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	365 while changesets:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	366 # update state
9584 17da88da1abd bisect: use util.system and fix good/bad when using -c Matt Mackall <mpm@selenic.com> parents: 9569 diff changeset	367 status = util.system(command)
7590 e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	368 if status == 125:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	369 transition = "skip"
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	370 elif status == 0:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	371 transition = "good"
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	372 # status < 0 means process was killed
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	373 elif status == 127:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	374 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: 7570 diff changeset	375 elif status < 0:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	376 raise util.Abort(_("%s killed") % command)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	377 else:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	378 transition = "bad"
8805 2726a6df11e9 bisect: improve --command output Patrick Mezard <pmezard@gmail.com> parents: 8802 diff changeset	379 ctx = repo[rev or '.']
2726a6df11e9 bisect: improve --command output Patrick Mezard <pmezard@gmail.com> parents: 8802 diff changeset	380 state[transition].append(ctx.node())
2726a6df11e9 bisect: improve --command output Patrick Mezard <pmezard@gmail.com> parents: 8802 diff changeset	381 ui.status(_('Changeset %d:%s: %s\n') % (ctx, ctx, transition))
7590 e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	382 check_state(state, interactive=False)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	383 # bisect
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	384 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: 7570 diff changeset	385 # update to next check
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	386 cmdutil.bail_if_changed(repo)
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	387 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: 7570 diff changeset	388 finally:
e5703ec08e64 bisect: improve hg bisect -c (relative paths, error handling) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7570 diff changeset	389 hbisect.save_state(repo, state)
9584 17da88da1abd bisect: use util.system and fix good/bad when using -c Matt Mackall <mpm@selenic.com> parents: 9569 diff changeset	390 return print_result(nodes, good)
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	391
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	392 # update state
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	393 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	394 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	395 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	396 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	397 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	398 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	399 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	400 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	401 hbisect.save_state(repo, state)
7227 e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	402
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	403 if not check_state(state):
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	404 return
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	405
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	406 # actually bisect
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	407 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	408 if changesets == 0:
e1afb50ec2aa bisect: ability to check revision with command Alexander Solovyov <piranha@piranha.org.ua> parents: 7213 diff changeset	409 print_result(nodes, good)
6858 8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	410 else:
8f256bf98219 Add support for multiple possible bisect results (issue1228, issue1182) Bernhard Leiner <bleiner@gmail.com> parents: 6842 diff changeset	411 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	412 node = nodes[0]
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	413 # compute the approximate number of remaining tests
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	414 tests, size = 0, 2
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	415 while size <= changesets:
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	416 tests, size = tests + 1, size * 2
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	417 rev = repo.changelog.rev(node)
9012 ada93c6bf554 bisect: fix format specifiers for integers C?dric Duval <cedricduval@free.fr> parents: 8995 diff changeset	418 ui.write(_("Testing changeset %d:%s "
ada93c6bf554 bisect: fix format specifiers for integers C?dric Duval <cedricduval@free.fr> parents: 8995 diff changeset	419 "(%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	420 % (rev, short(node), changesets, tests))
5775 2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	421 if not noupdate:
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	422 cmdutil.bail_if_changed(repo)
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	423 return hg.clean(repo, node)
2dd202a6e15b bisect: make bisect a built-in command Matt Mackall <mpm@selenic.com> parents: 5764 diff changeset	424
4202 b2873c587b1a branch: require --force to shadow existing branches Brendan Cully <brendan@kublai.com> parents: 4200 diff changeset	425 def branch(ui, repo, label=None, **opts):
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	426 """set or show the current branch name
8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	427
4601 e69da61e467e Notify the user that hg branch does not create a branch until commit Brendan Cully <brendan@kublai.com> parents: 4593 diff changeset	428 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	429 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	430 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	431 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	432 branch.
4202 b2873c587b1a branch: require --force to shadow existing branches Brendan Cully <brendan@kublai.com> parents: 4200 diff changeset	433
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	434 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	435 branch name that already exists, even if it's inactive.
5999 d1fe1a4eb2b7 Mention 'hg update' to switch branches in help for branch and branches. Thomas Arendsen Hein <thomas@intevation.de> parents: 5998 diff changeset	436
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	437 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	438 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	439 change.
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	440
8992 ff7d899a7a71 help: add more pointers to commit --close-branch Matt Mackall <mpm@selenic.com> parents: 8991 diff changeset	441 Use the command 'hg update' to switch to an existing branch. Use
ff7d899a7a71 help: add more pointers to commit --close-branch Matt Mackall <mpm@selenic.com> parents: 8991 diff changeset	442 'hg commit --close-branch' to mark this branch as closed.
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	443 """
8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	444
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	445 if opts.get('clean'):
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	446 label = repo[None].parents()[0].branch()
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	447 repo.dirstate.setbranch(label)
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	448 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	449 elif label:
10315 be324d31b6c5 commands: label from user is in local encoding Steve Borho <steve@borho.org> parents: 10269 diff changeset	450 utflabel = encoding.fromlocal(label)
be324d31b6c5 commands: label from user is in local encoding Steve Borho <steve@borho.org> parents: 10269 diff changeset	451 if not opts.get('force') and utflabel in repo.branchtags():
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	452 if label not in [p.branch() for p in repo.parents()]:
4202 b2873c587b1a branch: require --force to shadow existing branches Brendan Cully <brendan@kublai.com> parents: 4200 diff changeset	453 raise util.Abort(_('a branch of the same name already exists'
10596 7648f32713f2 branch: help misuse of hg branch to switch branches Yuya Nishihara <yuya@tcha.org> parents: 10579 diff changeset	454 " (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	455 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	456 ui.status(_('marked working directory as branch %s\n') % label)
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	457 else:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	458 ui.write("%s\n" % encoding.tolocal(repo.dirstate.branch()))
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	459
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	460 def branches(ui, repo, active=False, closed=False):
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	461 """list repository named branches
8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	462
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	463 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	464 inactive. If -c/--closed is specified, also list branches which have
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	465 been marked closed (see hg commit --close-branch).
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	466
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	467 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	468 is considered active if it contains repository heads.
5999 d1fe1a4eb2b7 Mention 'hg update' to switch branches in help for branch and branches. Thomas Arendsen Hein <thomas@intevation.de> parents: 5998 diff changeset	469
d1fe1a4eb2b7 Mention 'hg update' to switch branches in help for branch and branches. Thomas Arendsen Hein <thomas@intevation.de> parents: 5998 diff changeset	470 Use the command 'hg update' to switch to an existing branch.
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	471 """
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	472
6631 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	473 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: 9665 diff changeset	474 activebranches = [repo[n].branch() for n in repo.heads()]
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	475 def testactive(tag, node):
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	476 realhead = tag in activebranches
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	477 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	478 return realhead and open
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 8779 diff changeset	479 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	480 for tag, node in repo.branchtags().items()],
344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	481 reverse=True)
6631 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	482
a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	483 for isactive, node, tag in branches:
a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6625 diff changeset	484 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: 9665 diff changeset	485 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	486 if ui.quiet:
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9665 diff changeset	487 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	488 else:
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	489 hn = repo.lookup(node)
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	490 if isactive:
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	491 notice = ''
6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	492 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	493 if not closed:
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	494 continue
9951 9b626a63f556 commands: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 9894 diff changeset	495 notice = _(' (closed)')
7656 6a24fb994701 branch closing: referencing open and closed branches/heads John Mulligan <phlogistonjohn@asynchrono.us> parents: 7655 diff changeset	496 else:
9951 9b626a63f556 commands: mark strings for translation Martin Geisler <mg@lazybytes.net> parents: 9894 diff changeset	497 notice = _(' (inactive)')
9675 ee913987e4b0 localrepo/branchcache: remove lbranchmap(), convert users to use utf-8 names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9665 diff changeset	498 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: 9665 diff changeset	499 data = encodedtag, rev, hexfunc(hn), notice
6814 88804fad71bc branches unparseable output fix (issue1230) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6682 diff changeset	500 ui.write("%s %s:%s%s\n" % data)
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3472 diff changeset	501
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2493 diff changeset	502 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	503 """create a changegroup file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	504
3511 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	505 Generate a compressed changegroup file collecting changesets not
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	506 known to be in another repository.
3511 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	507
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	508 If you omit the destination repository, then hg assumes the
a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	509 destination will have all the nodes you specify with --base
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	510 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	511 -a/--all (or --base null).
d403cf4eb32d help: describe bundle compression methods (issue1523) Henrik Stuart <hg@hstuart.dk> parents: 8902 diff changeset	512
8958 8358cf63f612 commands: improve bundle compression methods description Stefano Mioli <jstevie@gmail.com> parents: 8955 diff changeset	513 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	514 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	515 gzip (by default, bundles are compressed using bzip2).
3511 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	516
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	517 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	518 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	519 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	520 available or when exporting an entire repository is undesirable.
3511 aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	521
aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	522 Applying bundles preserves all changeset contents including
aa8f086cb141 Corrected help text for bundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3510 diff changeset	523 permissions, copy/rename information, and revision history.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	524 """
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	525 revs = opts.get('rev') or None
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	526 if revs:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	527 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	528 if opts.get('all'):
73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	529 base = ['null']
73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	530 else:
73b1de288801 Add --all option to bundle command John Mulligan <phlogistonjohn@yahoo.com> parents: 6163 diff changeset	531 base = opts.get('base')
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	532 if base:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	533 if dest:
8669 6f0f69da003e commands: typo in bundle abort message Martin Geisler <mg@lazybytes.net> parents: 8664 diff changeset	534 raise util.Abort(_("--base is incompatible with specifying "
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	535 "a destination"))
3318 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	536 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: 3284 diff changeset	537 # create the right base
a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	538 # XXX: nodesbetween / changegroup* should be "fixed" instead
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	539 o = []
8464 7af92e70bb25 revlog: use set instead of dict Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8408 diff changeset	540 has = set((nullid,))
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	541 for n in base:
3631 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3629 diff changeset	542 has.update(repo.changelog.reachable(n))
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	543 if revs:
3318 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	544 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	545 has.difference_update(revs)
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	546 else:
3318 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	547 visit = repo.changelog.heads()
3631 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3629 diff changeset	548 seen = {}
3318 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	549 while visit:
a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	550 n = visit.pop(0)
3631 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3629 diff changeset	551 parents = [p for p in repo.changelog.parents(n) if p not in has]
3318 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	552 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	553 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	554 o.append(n)
3318 a225055b3b59 bundle --base: use the right set for the base Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3284 diff changeset	555 else:
3512 630e0b216192 fix graph traversal in commands.bundle (it wasn't O(n)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3511 diff changeset	556 for p in parents:
630e0b216192 fix graph traversal in commands.bundle (it wasn't O(n)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3511 diff changeset	557 if p not in seen:
3631 770c4fc03b8e bundle: don't use sets.Set Matt Mackall <mpm@selenic.com> parents: 3629 diff changeset	558 seen[p] = 1
3512 630e0b216192 fix graph traversal in commands.bundle (it wasn't O(n)) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3511 diff changeset	559 visit.append(p)
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	560 else:
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	561 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	562 dest, branches = hg.parseurl(dest, opts.get('branch'))
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	563 other = hg.repository(cmdutil.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	564 revs, checkout = hg.addbranchrevs(repo, other, branches, revs)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	565 o = repo.findoutgoing(other, force=opts.get('force'))
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	566
10616 65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10596 diff changeset	567 if not o:
65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10596 diff changeset	568 ui.status(_("no changes found\n"))
65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10596 diff changeset	569 return
65b178f30eae bundle: fix bundle generation for empty changegroup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10596 diff changeset	570
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	571 if revs:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	572 cg = repo.changegroupsubset(o, revs, 'bundle')
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	573 else:
d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	574 cg = repo.changegroup(o, 'bundle')
6570 626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	575
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	576 bundletype = opts.get('type', 'bzip2').lower()
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	577 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	578 bundletype = btypes.get(bundletype)
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	579 if bundletype not in changegroup.bundletypes:
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	580 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	581
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	582 changegroup.writebundle(cg, fname, bundletype)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	583
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	584 def cat(ui, repo, file1, pats, *opts):
3914 283ee8971570 doc string fix: hg cat and manifest default to current parent revision. Thomas Arendsen Hein <thomas@intevation.de> parents: 3900 diff changeset	585 """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	586
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	587 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	588 no revision is given, the parent of the working directory is used,
3915 3c82ab166eea doc fix: hg tags defaults to current parent revision, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3914 diff changeset	589 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	590
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	591 Output may be to a file, in which case the name of the file is
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	592 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	593 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	594
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	595 :``%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	596 :``%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	597 :``%p``: root-relative path name of file being printed
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	598 """
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	599 ctx = repo[opts.get('rev')]
4697 5b2d986de0f8 cat: return an error on failure Matt Mackall <mpm@selenic.com> parents: 4692 diff changeset	600 err = 1
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	601 m = cmdutil.match(repo, (file1,) + pats, opts)
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	602 for abs in ctx.walk(m):
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	603 fp = cmdutil.make_file(repo, opts.get('output'), ctx.node(), pathname=abs)
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	604 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	605 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	606 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	607 fp.write(data)
4697 5b2d986de0f8 cat: return an error on failure Matt Mackall <mpm@selenic.com> parents: 4692 diff changeset	608 err = 0
5b2d986de0f8 cat: return an error on failure Matt Mackall <mpm@selenic.com> parents: 4692 diff changeset	609 return err
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	610
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	611 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	612 """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	613
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	614 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	615
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	616 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	617 basename of the source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	618
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	619 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	620 .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	621
7942 553cef16031f mention default branch in branch and clone help Matt Mackall <mpm@selenic.com> parents: 7880 diff changeset	622 See 'hg help urls' for valid source format details.
553cef16031f mention default branch in branch and clone help Matt Mackall <mpm@selenic.com> parents: 7880 diff changeset	623
9970 36760956f6d3 commands: mark "ssh://" as inline literals in help texts Martin Geisler <mg@lazybytes.net> parents: 9952 diff changeset	624 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: 7880 diff changeset	625 .hg/hgrc and working directory will be created on the remote side.
9970 36760956f6d3 commands: mark "ssh://" as inline literals in help texts Martin Geisler <mg@lazybytes.net> parents: 9952 diff changeset	626 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: 7880 diff changeset	627
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	628 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	629 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	630 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	631 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	632 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	633 will be pulled into the destination repository.
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	634 No subsequent changesets (including subsequent tags) will be present
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	635 in the destination.
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	636
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	637 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	638 local source repositories.
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	639
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	640 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	641 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	642 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	643 filesystems, such as AFS, implement hardlinking incorrectly, but
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	644 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	645 avoid hardlinking.
2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	646
10637 7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	647 In some cases, you can clone repositories and the working directory
9249 16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	648 using full hardlinks with ::
2762 2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	649
2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	650 $ cp -al REPO REPOCLONE
2df98f616645 Expand clone help with hardlink information Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> parents: 2761 diff changeset	651
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7982 diff changeset	652 This is the fastest way to clone, but it is not always safe. The
6509 5279848424e7 issue 1053: heavily qualify the "cp -al" advice for cloning Bryan O'Sullivan <bos@serpentine.com> parents: 6469 diff changeset	653 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: 6469 diff changeset	654 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	655 breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,
6509 5279848424e7 issue 1053: heavily qualify the "cp -al" advice for cloning Bryan O'Sullivan <bos@serpentine.com> parents: 6469 diff changeset	656 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: 6469 diff changeset	657 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	658
7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	659 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	660 revision from this list:
7ce62865d72a commands: document and test hg clone update priority timeless <timeless@gmail.com> parents: 10616 diff changeset	661
10645 ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	662 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	663 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	664 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	665 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	666 latest head of that branch)
ac280ab55c9f commands: remove extra indentation from list in help text Martin Geisler <mg@lazybytes.net> parents: 10637 diff changeset	667 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	668 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	669 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	670 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	671 h) tip
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	672 """
9714 2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	673 if opts.get('noupdate') and opts.get('updaterev'):
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	674 raise util.Abort(_("cannot specify both --noupdate and --updaterev"))
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	675
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	676 hg.clone(cmdutil.remoteui(ui, opts), source, dest,
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	677 pull=opts.get('pull'),
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	678 stream=opts.get('uncompressed'),
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	679 rev=opts.get('rev'),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	680 update=opts.get('updaterev') or not opts.get('noupdate'),
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	681 branch=opts.get('branch'))
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	682
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	683 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	684 """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	685
7983 7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7982 diff changeset	686 Commit changes to the given files into the repository. Unlike a
7b813bdbd5d0 Change double spaces to single spaces in help texts. Martin Geisler <mg@daimi.au.dk> parents: 7982 diff changeset	687 centralized RCS, this operation is a local operation. See hg push
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	688 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	689
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	690 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	691 will be committed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	692
6385 0d4e068e9e52 commit: when committing the results of a merge, it's all or nothing Bryan O'Sullivan <bos@serpentine.com> parents: 6375 diff changeset	693 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	694 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: 6375 diff changeset	695
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	696 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	697 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	698
1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	699 See 'hg help dates' for a list of formats valid for -d/--date.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	700 """
7655 cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	701 extra = {}
cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	702 if opts.get('close_branch'):
cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	703 extra['close'] = 1
8407 223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	704 e = cmdutil.commiteditor
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	705 if opts.get('force_editor'):
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	706 e = cmdutil.commitforceeditor
223000a687b0 commit: move commit editor to cmdutil, pass as function Matt Mackall <mpm@selenic.com> parents: 8397 diff changeset	707
6600 b822a379860b match: stop passing files through commitfunc Matt Mackall <mpm@selenic.com> parents: 6599 diff changeset	708 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	709 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	710 editor=e, extra=extra)
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6321 diff changeset	711
6369 53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	712 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	713 if not node:
8995 7b19cda0fa10 commit: lose some pointless 'nothing changed' messages Matt Mackall <mpm@selenic.com> parents: 8992 diff changeset	714 ui.status(_("nothing changed\n"))
6369 53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	715 return
53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	716 cl = repo.changelog
53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	717 rev = cl.rev(node)
53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	718 parents = cl.parentrevs(rev)
53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	719 if rev - 1 in parents:
53912d30ac40 Avoid calling heads() twice on every hg commit. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6367 diff changeset	720 # one of the parents was the old tip
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	721 pass
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing. Gilles Moris <gilles.moris@free.fr> parents: 6934 diff changeset	722 elif (parents == (nullrev, nullrev) or
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing. Gilles Moris <gilles.moris@free.fr> parents: 6934 diff changeset	723 len(cl.heads(cl.node(parents[0]))) > 1 and
03916abdfb64 Have verbose and debug flag print the changeset rev and hash when committing. Gilles Moris <gilles.moris@free.fr> parents: 6934 diff changeset	724 (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)):
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6321 diff changeset	725 ui.status(_('created new head\n'))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	726
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	727 if ui.debugflag:
9198 061eeb602354 coding style: use a space after comma Martin Geisler <mg@lazybytes.net> parents: 9197 diff changeset	728 ui.write(_('committed changeset %d:%s\n') % (rev, hex(node)))
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	729 elif ui.verbose:
9198 061eeb602354 coding style: use a space after comma Martin Geisler <mg@lazybytes.net> parents: 9197 diff changeset	730 ui.write(_('committed changeset %d:%s\n') % (rev, short(node)))
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	731
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	732 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	733 """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	734
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	735 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: 6442 diff changeset	736 directory, copies are put in that directory. If dest is a file,
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	737 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	738
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	739 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	740 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	741 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	742
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	743 This command takes effect with the next commit. To undo a copy
3829 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3822 diff changeset	744 before that, see hg revert.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	745 """
4914 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	746 wlock = repo.wlock(False)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	747 try:
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5589 diff changeset	748 return cmdutil.copy(ui, repo, pats, opts)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	749 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	750 wlock.release()
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	751
6189 81cbb5dfdec0 Make hg debugancestor accept -R by making it an optionalrepo command. Thomas Arendsen Hein <thomas@intevation.de> parents: 6188 diff changeset	752 def debugancestor(ui, repo, *args):
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	753 """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	754 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	755 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	756 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	757 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	758 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	759 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	760 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	761 "(.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	762 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	763 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	764 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	765 else:
81afdd016867 debugancestor: make the index argument optional, defaulting to 00changelog.i Bryan O'Sullivan <bos@serpentine.com> parents: 6171 diff changeset	766 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	767 a = r.ancestor(lookup(rev1), lookup(rev2))
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	768 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	769
7880 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7875 diff changeset	770 def debugcommands(ui, cmd='', *args):
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	771 for cmd, vals in sorted(table.iteritems()):
7880 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7875 diff changeset	772 cmd = cmd.split('\|')[0].strip('^')
7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7875 diff changeset	773 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: 7875 diff changeset	774 ui.write('%s: %s\n' % (cmd, opts))
7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7875 diff changeset	775
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	776 def debugcomplete(ui, cmd='', **opts):
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	777 """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	778
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	779 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	780 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	781 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	782 if cmd:
7213 b4c035057d34 findcmd: have dispatch look up strict flag Matt Mackall <mpm@selenic.com> parents: 7212 diff changeset	783 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	784 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	785 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	786 for o in t:
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	787 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	788 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	789 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	790 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	791 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	792
7509 62e5d41b0a8b Make debugcomplete -v print aliases as well as commands Brendan Cully <brendan@kublai.com> parents: 7449 diff changeset	793 cmdlist = cmdutil.findpossible(cmd, table)
62e5d41b0a8b Make debugcomplete -v print aliases as well as commands Brendan Cully <brendan@kublai.com> parents: 7449 diff changeset	794 if ui.verbose:
62e5d41b0a8b Make debugcomplete -v print aliases as well as commands Brendan Cully <brendan@kublai.com> parents: 7449 diff changeset	795 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	796 ui.write("%s\n" % "\n".join(sorted(cmdlist)))
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	797
5741 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5716 diff changeset	798 def debugfsinfo(ui, path = "."):
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 9012 diff changeset	799 open('.debugfsinfo', 'w').write('')
5741 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5716 diff changeset	800 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: 5716 diff changeset	801 ui.write('symlink: %s\n' % (util.checklink(path) and 'yes' or 'no'))
6746 1dca460e7d1e rename checkfolding to checkcase Matt Mackall <mpm@selenic.com> parents: 6743 diff changeset	802 ui.write('case-sensitive: %s\n' % (util.checkcase('.debugfsinfo')
5741 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5716 diff changeset	803 and 'yes' or 'no'))
8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5716 diff changeset	804 os.unlink('.debugfsinfo')
8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5716 diff changeset	805
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	806 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	807 """rebuild the dirstate as it would look like for the given revision"""
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	808 ctx = repo[rev]
1760 13f8e068d13c fix typo in debugrebuildstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	809 wlock = repo.wlock()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	810 try:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	811 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	812 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	813 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	814
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	815 def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	816 """validate the correctness of the current dirstate"""
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	817 parent1, parent2 = repo.dirstate.parents()
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	818 m1 = repo[parent1].manifest()
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	819 m2 = repo[parent2].manifest()
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	820 errors = 0
4906 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	821 for f in repo.dirstate:
30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	822 state = repo.dirstate[f]
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	823 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	824 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	825 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	826 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	827 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	828 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	829 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	830 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	831 (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	832 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	833 for f in m1:
4906 30847b8af7ca dirstate: add __contains__ and make __getitem__ more useful Matt Mackall <mpm@selenic.com> parents: 4904 diff changeset	834 state = repo.dirstate[f]
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	835 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	836 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	837 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	838 if errors:
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	839 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	840 raise util.Abort(error)
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	841
3553 e1508621e9ef add --untrusted to showconfig Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3521 diff changeset	842 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	843 """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	844
8664 f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	845 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	846
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	847 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	848 of that config item.
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	849
f265106ccb53 commands: expand "arg" -> "argument" in showconfig help strings Martin Geisler <mg@lazybytes.net> parents: 8636 diff changeset	850 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	851 items with matching section names.
8279 602ed4982f36 commands: describe --debug in showconfig help Martin Geisler <mg@lazybytes.net> parents: 8277 diff changeset	852
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	853 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	854 for each config item.
8279 602ed4982f36 commands: describe --debug in showconfig help Martin Geisler <mg@lazybytes.net> parents: 8277 diff changeset	855 """
2410 1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	856
3553 e1508621e9ef add --untrusted to showconfig Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3521 diff changeset	857 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	858 if values:
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	859 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	860 raise util.Abort(_('only one config item permitted'))
3553 e1508621e9ef add --untrusted to showconfig Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3521 diff changeset	861 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	862 sectname = section + '.' + name
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	863 if values:
1e80d47b8581 debugconfig: allow to print by section and exact item name Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2407 diff changeset	864 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	865 if v == section:
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	866 ui.debug('%s: ' %
b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	867 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	868 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	869 elif v == sectname:
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	870 ui.debug('%s: ' %
b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	871 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	872 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	873 else:
8182 b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	874 ui.debug('%s: ' %
b97abc7c1135 showconfig: show source file and line with --debug Matt Mackall <mpm@selenic.com> parents: 8152 diff changeset	875 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	876 ui.write('%s=%s\n' % (sectname, value))
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	877
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	878 def debugsetparents(ui, repo, rev1, rev2=None):
1470 fb9b84c91222 minor fix on command help docstrings TK Soh <teekaysoh@yahoo.com> parents: 1469 diff changeset	879 """manually set the parents of the current working directory
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	880
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	881 This is useful for writing repository conversion tools, but should
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	882 be used with care.
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	883 """
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	884
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	885 if not rev2:
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	886 rev2 = hex(nullid)
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	887
4247 89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	888 wlock = repo.wlock()
89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	889 try:
89075f106414 debugsetparents: wlock the repo before updating the dirstate Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4231 diff changeset	890 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	891 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	892 wlock.release()
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	893
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	894 def debugstate(ui, repo, nodates=None):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	895 """show the contents of the current dirstate"""
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	896 timestr = ""
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	897 showdate = not nodates
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	898 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	899 if showdate:
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	900 if ent[3] == -1:
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	901 # Pad or slice to locale representation
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	902 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	903 time.localtime(0)))
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	904 timestr = 'unset'
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	905 timestr = (timestr[:locale_len] +
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	906 ' ' * (locale_len - len(timestr)))
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	907 else:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	908 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	909 time.localtime(ent[3]))
5156 49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5155 diff changeset	910 if ent[1] & 020000:
49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5155 diff changeset	911 mode = 'lnk'
49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5155 diff changeset	912 else:
49554ba98951 debugstate: print symlinks as 'lnk', not '777' Bryan O'Sullivan <bos@serpentine.com> parents: 5155 diff changeset	913 mode = '%3o' % (ent[1] & 0777)
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	914 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	915 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	916 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copied(f), f))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	917
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	918 def debugsub(ui, repo, rev=None):
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	919 if rev == '':
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	920 rev = None
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	921 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	922 ui.write('path %s\n' % k)
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	923 ui.write(' source %s\n' % v[0])
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	924 ui.write(' revision %s\n' % v[1])
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	925
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	926 def debugdata(ui, file_, rev):
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	927 """dump the contents of a data file revision"""
b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	928 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	929 try:
1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	930 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	931 except KeyError:
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 3071 diff changeset	932 raise util.Abort(_('invalid revision identifier %s') % rev)
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	933
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	934 def debugdate(ui, date, range=None, **opts):
3805 299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	935 """parse and display a date"""
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	936 if opts["extended"]:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	937 d = util.parsedate(date, util.extendeddateformats)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	938 else:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	939 d = util.parsedate(date)
3805 299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	940 ui.write("internal: %s %s\n" % d)
299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	941 ui.write("standard: %s\n" % util.datestr(d))
3812 bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	942 if range:
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	943 m = util.matchdate(range)
bf6ab30559e6 Add date matching support Matt Mackall <mpm@selenic.com> parents: 3805 diff changeset	944 ui.write("match: %s\n" % m(d[0]))
3805 299d6cce6c0b add debugdate command Matt Mackall <mpm@selenic.com> parents: 3804 diff changeset	945
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	946 def debugindex(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	947 """dump the contents of an index file"""
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	948 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
7737 26bdb7109170 commands: removed unnecessary string concatenation Martin Geisler <mg@daimi.au.dk> parents: 7695 diff changeset	949 ui.write(" rev offset length base linkrev"
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	950 " nodeid p1 p2\n")
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	951 for i in r:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	952 node = r.node(i)
5311 599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	953 try:
599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	954 pp = r.parents(node)
599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	955 except:
599f3a690d8f debugindex: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5310 diff changeset	956 pp = [nullid, nullid]
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	957 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	958 i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	959 short(node), short(pp[0]), short(pp[1])))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	960
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	961 def debugindexdot(ui, file_):
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	962 """dump an index DAG as a graphviz dot file"""
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	963 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	964 ui.write("digraph G {\n")
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6749 diff changeset	965 for i in r:
2287 3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	966 node = r.node(i)
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	967 pp = r.parents(node)
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	968 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	969 if pp[1] != nullid:
3f18d1eea370 Update debugindexdot to work with RevlogNG. Samuel Masham <samuel.masham@gmail.com> parents: 2283 diff changeset	970 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	971 ui.write("}\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	972
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	973 def debuginstall(ui):
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	974 '''test Mercurial installation'''
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	975
3846 18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	976 def writetemp(contents):
4849 035489f60842 Use a prefix for debuginstall tempfiles. Thomas Arendsen Hein <thomas@intevation.de> parents: 4818 diff changeset	977 (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	978 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	979 f.write(contents)
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	980 f.close()
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	981 return name
18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	982
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	983 problems = 0
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	984
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	985 # encoding
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	986 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	987 try:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	988 encoding.fromlocal("test")
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	989 except util.Abort, inst:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	990 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	991 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	992 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	993
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	994 # compiled modules
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	995 ui.status(_("Checking extensions...\n"))
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	996 try:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	997 import bdiff, mpatch, base85
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	998 except Exception, inst:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	999 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	1000 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	1001 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	1002 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1003
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1004 # templates
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1005 ui.status(_("Checking templates...\n"))
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1006 try:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1007 import templater
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7850 diff changeset	1008 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	1009 except Exception, inst:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1010 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	1011 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	1012 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1013
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1014 # patch
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1015 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	1016 patchproblems = 0
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1017 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	1018 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	1019 fa = writetemp(a)
5482 e5eedd74e70f Use both the from and to name in mdiff.unidiff. Dustin Sallings <dustin@spy.net> parents: 5405 diff changeset	1020 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	1021 os.path.basename(fa))
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1022 fd = writetemp(d)
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1023
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1024 files = {}
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1025 try:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1026 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	1027 except util.Abort, e:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1028 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	1029 ui.write(" " + str(e) + "\n")
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1030 patchproblems += 1
3846 18855084b922 Make debuginstall actually attempt to use external patch and merge Matt Mackall <mpm@selenic.com> parents: 3844 diff changeset	1031 else:
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1032 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	1033 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	1034 patchproblems += 1
9031 3b76321aa0de compat: use open() instead of file() everywhere Alejandro Santos <alejolp@alejolp.com> parents: 9012 diff changeset	1035 a = open(fa).read()
5310 ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1036 if a != b:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1037 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	1038 patchproblems += 1
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1039
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1040 if patchproblems:
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1041 if ui.config('ui', 'patch'):
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1042 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	1043 " 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	1044 else:
5760 0145f9afb0e7 Removed tabs and trailing whitespace in python files Thomas Arendsen Hein <thomas@intevation.de> parents: 5741 diff changeset	1045 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	1046 " 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	1047 problems += patchproblems
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1048
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1049 os.unlink(fa)
ba3dc7883968 debuginstall: stop looking for patch utility, just test it Patrick Mezard <pmezard@gmail.com> parents: 5300 diff changeset	1050 os.unlink(fd)
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1051
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1052 # editor
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1053 ui.status(_("Checking commit editor...\n"))
5660 3c80ecdc1bcd Use VISUAL in addition to EDITOR when choosing the editor to use. Osku Salerma <osku@iki.fi> parents: 5658 diff changeset	1054 editor = ui.geteditor()
4488 62019c4427e3 Introduce find_exe. Use instead of find_in_path for programs. Bryan O'Sullivan <bos@serpentine.com> parents: 4438 diff changeset	1055 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	1056 if not cmdpath:
3855 b9cdd6f2aa43 debuginstall: fix a copy/paste error Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3848 diff changeset	1057 if editor == 'vi':
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1058 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	1059 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	1060 else:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1061 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	1062 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	1063 problems += 1
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1064
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1065 # check username
8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1066 ui.status(_("Checking username...\n"))
9734 36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1067 try:
36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1068 user = ui.username()
36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1069 except util.Abort, e:
36c388a1aa51 commands: call ui.username carefully in debuginstall Martin Geisler <mg@lazybytes.net> parents: 9725 diff changeset	1070 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	1071 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	1072 problems += 1
3848 8cbf060f637e Add some remedies and a username check to debuginstall Matt Mackall <mpm@selenic.com> parents: 3846 diff changeset	1073
3844 3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1074 if not problems:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1075 ui.status(_("No problems detected\n"))
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1076 else:
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1077 ui.write(_("%s problems detected,"
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1078 " please check your install!\n") % problems)
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1079
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1080 return problems
3ba82c3f4bc3 Add debuginstall command to do basic install tests Matt Mackall <mpm@selenic.com> parents: 3840 diff changeset	1081
3652 f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3651 diff changeset	1082 def debugrename(ui, repo, file1, pats, *opts):
1194 c165cbf56bb1 Add doc string for debugrename. bos@serpentine.internal.keyresearch.com parents: 1193 diff changeset	1083 """dump rename information"""
3652 f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3651 diff changeset	1084
6748 c6cc35a3d1de make debugrename work on p1, not tip Matt Mackall <mpm@selenic.com> parents: 6747 diff changeset	1085 ctx = repo[opts.get('rev')]
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1086 m = cmdutil.match(repo, (file1,) + pats, opts)
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	1087 for abs in ctx.walk(m):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	1088 fctx = ctx[abs]
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1089 o = fctx.filelog().renamed(fctx.filenode())
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	1090 rel = m.rel(abs)
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1091 if o:
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	1092 ui.write(_("%s renamed from %s:%s\n") % (rel, o[0], hex(o[1])))
3652 f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3651 diff changeset	1093 else:
f4dece0f7016 refactor debugrenamed Matt Mackall <mpm@selenic.com> parents: 3651 diff changeset	1094 ui.write(_("%s not renamed\n") % rel)
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1095
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1096 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	1097 """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	1098 m = cmdutil.match(repo, pats, opts)
6585 d3d1d39da2fa walk: remove cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6584 diff changeset	1099 items = list(repo.walk(m))
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1100 if not items:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1101 return
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1102 fmt = 'f %%-%ds %%-%ds %%s' % (
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1103 max([len(abs) for abs in items]),
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1104 max([len(m.rel(abs)) for abs in items]))
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1105 for abs in items:
d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	1106 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	1107 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	1108
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	1109 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	1110 """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	1111
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1112 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	1113
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1114 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	1115
3822 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	1116 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: 3815 diff changeset	1117 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: 3815 diff changeset	1118 changeset if no revisions are specified.
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	1119
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1120 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	1121 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	1122 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	1123 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	1124 to its parent.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1125
10527 9c0ba837dc65 commands: correct diff -c explanation timeless <timeless@mozdev.org> parents: 10520 diff changeset	1126 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	1127 the changes in that changeset relative to its first parent.
10520 75361931884d commands: mention diff -c timeless <timeless@mozdev.org> parents: 10515 diff changeset	1128
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1129 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	1130 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	1131 anyway, probably with undesirable results.
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1132
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1133 Use the -g/--git option to generate diffs in the git extended diff
7974 a8a719ff150a commands: use single-quotes for 'hg help ...' hints Martin Geisler <mg@daimi.au.dk> parents: 7948 diff changeset	1134 format. For more information, read 'hg help diffs'.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1135 """
7628 9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1136
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1137 revs = opts.get('rev')
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1138 change = opts.get('change')
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1139 stat = opts.get('stat')
9857 24bc6e414610 diff: change --inverse to --reverse Martin Geisler <mg@lazybytes.net> parents: 9839 diff changeset	1140 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	1141
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1142 if revs and change:
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1143 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	1144 raise util.Abort(msg)
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1145 elif change:
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1146 node2 = repo.lookup(change)
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1147 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	1148 else:
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	1149 node1, node2 = cmdutil.revpair(repo, revs)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1150
9857 24bc6e414610 diff: change --inverse to --reverse Martin Geisler <mg@lazybytes.net> parents: 9839 diff changeset	1151 if reverse:
9725 3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9718 diff changeset	1152 node1, node2 = node2, node1
3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 9718 diff changeset	1153
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1154 if stat:
9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1155 opts['unified'] = '0'
9642 7d17794f08a9 diffstat: with --git, mark binary files with Bin Brodie Rao <me+hg@dackz.net> parents: 9640 diff changeset	1156 diffopts = patch.diffopts(ui, opts)
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1157
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	1158 m = cmdutil.match(repo, pats, opts)
9642 7d17794f08a9 diffstat: with --git, mark binary files with Bin Brodie Rao <me+hg@dackz.net> parents: 9640 diff changeset	1159 it = patch.diff(repo, node1, node2, match=m, opts=diffopts)
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1160 if stat:
10948 61cd6653f846 diffstat: use ui.plain() instead of ui.interactive() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10933 diff changeset	1161 width = 80
61cd6653f846 diffstat: use ui.plain() instead of ui.interactive() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10933 diff changeset	1162 if not ui.plain():
61cd6653f846 diffstat: use ui.plain() instead of ui.interactive() Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 10933 diff changeset	1163 width = util.termwidth()
9642 7d17794f08a9 diffstat: with --git, mark binary files with Bin Brodie Rao <me+hg@dackz.net> parents: 9640 diff changeset	1164 ui.write(patch.diffstat(util.iterlines(it), width=width,
7d17794f08a9 diffstat: with --git, mark binary files with Bin Brodie Rao <me+hg@dackz.net> parents: 9640 diff changeset	1165 git=diffopts.git))
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1166 else:
9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1167 for chunk in it:
9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	1168 ui.write(chunk)
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	1169
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1170 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	1171 """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	1172
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1173 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	1174
10334 3d75c691b77d commands: fix the list of changeset header information in 'hg help export' Steve Losh <steve@stevelosh.com> parents: 10331 diff changeset	1175 The information shown in the changeset header is: author, date,
10335 6ae4f390ec61 commands: fix more changeset header information in 'hg help export' Steve Losh <steve@stevelosh.com> parents: 10334 diff changeset	1176 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: 10334 diff changeset	1177 comment.
3822 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	1178
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1179 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	1180 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	1181 first parent only.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1182
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1183 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	1184 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	1185
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1186 :``%%``: literal "%" character
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1187 :``%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	1188 :``%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	1189 :``%R``: changeset revision number
4322e39bd525 commands: use field lists instead of literal blocks in docstrings Martin Geisler <mg@lazybytes.net> parents: 9891 diff changeset	1190 :``%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	1191 :``%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	1192 :``%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	1193 :``%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	1194
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1195 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	1196 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	1197 diff anyway, probably with undesirable results.
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1198
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1199 Use the -g/--git option to generate diffs in the git extended diff
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1200 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	1201
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1202 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	1203 second parent. It can be useful to review a merge.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1204 """
10015 b5f352f33520 commands.export: accept -r option as revision specification Alexander Solovyov <piranha@piranha.org.ua> parents: 10014 diff changeset	1205 changesets += tuple(opts.get('rev', []))
610 4c02464cb9f0 check export options for changeset before running shaleh@speakeasy.net parents: 609 diff changeset	1206 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	1207 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	1208 revs = cmdutil.revrange(repo, changesets)
2874 4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2871 diff changeset	1209 if len(revs) > 1:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2871 diff changeset	1210 ui.note(_('exporting patches:\n'))
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2871 diff changeset	1211 else:
4ec58b157265 refactor text diff/patch code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2871 diff changeset	1212 ui.note(_('exporting patch:\n'))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1213 patch.export(repo, revs, template=opts.get('output'),
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1214 switch_parent=opts.get('switch_parent'),
2888 3848488244fc Move ui.diffopts to patch.diffopts where it belongs Matt Mackall <mpm@selenic.com> parents: 2883 diff changeset	1215 opts=patch.diffopts(ui, opts))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1216
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1217 def forget(ui, repo, pats, *opts):
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1218 """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	1219
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1220 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	1221 after the next commit.
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1222
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1223 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	1224 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	1225 working directory.
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1226
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1227 To undo a forget before the next commit, see hg add.
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1228 """
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1229
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1230 if not pats:
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1231 raise util.Abort(_('no files specified'))
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1232
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1233 m = cmdutil.match(repo, pats, opts)
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1234 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	1235 forget = sorted(s[0] + s[1] + s[3] + s[6])
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1236
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1237 for f in m.files():
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1238 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	1239 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	1240 % m.rel(f))
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1241
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1242 for f in forget:
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1243 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	1244 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	1245
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1246 repo.remove(forget, unlink=False)
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	1247
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1248 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	1249 """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	1250
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1251 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	1252
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	1253 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: 6442 diff changeset	1254 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	1255 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	1256 match appears.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1257
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1258 By default, grep only prints output for the first revision of a
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	1259 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	1260 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	1261 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	1262 use the --all flag.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1263 """
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1264 reflags = 0
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1265 if opts.get('ignore_case'):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1266 reflags \|= re.I
4877 242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4835 diff changeset	1267 try:
242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4835 diff changeset	1268 regexp = re.compile(pattern, reflags)
242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4835 diff changeset	1269 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	1270 ui.warn(_("grep: invalid match pattern: %s\n") % inst)
4877 242026115e6a hg grep: handle re.compile errors & update tests/test-grep Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4835 diff changeset	1271 return None
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1272 sep, eol = ':', '\n'
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1273 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	1274 sep = eol = '\0'
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1275
9097 431462bd8478 fix memory usage of revlog caches by limiting cache size [issue1639] Matt Mackall <mpm@selenic.com> parents: 8995 diff changeset	1276 getfile = util.lrucachefunc(repo.file)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1277
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1278 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	1279 begin = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1280 linenum = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1281 while True:
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1282 match = regexp.search(body, begin)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1283 if not match:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1284 break
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1285 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	1286 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	1287 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	1288 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	1289 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	1290 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1291
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	1292 class linestate(object):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1293 def __init__(self, line, linenum, colstart, colend):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1294 self.line = line
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1295 self.linenum = linenum
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1296 self.colstart = colstart
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1297 self.colend = colend
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1298
6469 fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6468 diff changeset	1299 def __hash__(self):
fb502719c75c python 2.6 compatibility: add __hash__ to classes that have __eq__ Paul Moore <p.f.moore@gmail.com> parents: 6468 diff changeset	1300 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: 6468 diff changeset	1301
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1302 def __eq__(self, other):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1303 return self.line == other.line
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1304
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1305 matches = {}
2870 8eaaf1321bfe grep: add --follow support. Brendan Cully <brendan@kublai.com> parents: 2869 diff changeset	1306 copies = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1307 def grepbody(fn, rev, body):
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1308 matches[rev].setdefault(fn, [])
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1309 m = matches[rev][fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1310 for lnum, cstart, cend, line in matchlines(body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1311 s = linestate(line, lnum, cstart, cend)
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1312 m.append(s)
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1313
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1314 def difflinestates(a, b):
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1315 sm = difflib.SequenceMatcher(None, a, b)
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1316 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: 2854 diff changeset	1317 if tag == 'insert':
3472 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3471 diff changeset	1318 for i in xrange(blo, bhi):
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1319 yield ('+', b[i])
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1320 elif tag == 'delete':
3472 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3471 diff changeset	1321 for i in xrange(alo, ahi):
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1322 yield ('-', a[i])
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1323 elif tag == 'replace':
3472 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3471 diff changeset	1324 for i in xrange(alo, ahi):
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1325 yield ('-', a[i])
3472 df7202f6887c use xrange instead of range Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3471 diff changeset	1326 for i in xrange(blo, bhi):
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1327 yield ('+', b[i])
81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1328
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1329 def display(fn, ctx, pstates, states):
6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1330 rev = ctx.rev()
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	1331 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	1332 found = False
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1333 filerevmatches = {}
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1334 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	1335 iter = difflinestates(pstates, states)
2869 81f351c5264d grep: display correct user/revision for --all in reverse. Brendan Cully <brendan@kublai.com> parents: 2854 diff changeset	1336 else:
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1337 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	1338 for change, l in iter:
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1339 cols = [fn, str(rev)]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1340 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	1341 cols.append(str(l.linenum))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1342 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	1343 cols.append(change)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1344 if opts.get('user'):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1345 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: 6109 diff changeset	1346 if opts.get('date'):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1347 cols.append(datefunc(ctx.date()))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1348 if opts.get('files_with_matches'):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	1349 c = (fn, rev)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1350 if c in filerevmatches:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1351 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1352 filerevmatches[c] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1353 else:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1354 cols.append(l.line)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1355 ui.write(sep.join(cols), eol)
3951 cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1356 found = True
cb66641cdee3 grep: remove count handling, simplify, fix issue337 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3950 diff changeset	1357 return found
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1358
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1359 skip = {}
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1360 revfiles = {}
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9625 diff changeset	1361 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	1362 found = False
2870 8eaaf1321bfe grep: add --follow support. Brendan Cully <brendan@kublai.com> parents: 2869 diff changeset	1363 follow = opts.get('follow')
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1364
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1365 def prep(ctx, fns):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1366 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1367 pctx = ctx.parents()[0]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1368 parent = pctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1369 matches.setdefault(rev, {})
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1370 matches.setdefault(parent, {})
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1371 files = revfiles.setdefault(rev, [])
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1372 for fn in fns:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1373 flog = getfile(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1374 try:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1375 fnode = ctx.filenode(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1376 except error.LookupError:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1377 continue
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1378
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1379 copied = flog.renamed(fnode)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1380 copy = follow and copied and copied[0]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1381 if copy:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1382 copies.setdefault(rev, {})[fn] = copy
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1383 if fn in skip:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1384 if copy:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1385 skip[copy] = True
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1386 continue
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1387 files.append(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1388
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1389 if fn not in matches[rev]:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1390 grepbody(fn, rev, flog.read(fnode))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1391
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1392 pfn = copy or fn
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1393 if pfn not in matches[parent]:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1394 try:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1395 fnode = pctx.filenode(pfn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1396 grepbody(pfn, parent, flog.read(fnode))
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7632 diff changeset	1397 except error.LookupError:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1398 pass
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1399
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	1400 for ctx in cmdutil.walkchangerevs(repo, matchfn, opts, prep):
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1401 rev = ctx.rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1402 parent = ctx.parents()[0].rev()
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1403 for fn in sorted(revfiles.get(rev, [])):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1404 states = matches[rev][fn]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1405 copy = copies.get(rev, {}).get(fn)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1406 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	1407 if copy:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1408 skip[copy] = True
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1409 continue
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1410 pstates = matches.get(parent, {}).get(copy or fn, [])
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1411 if pstates or states:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1412 r = display(fn, ctx, pstates, states)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1413 found = found or r
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1414 if r and not opts.get('all'):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1415 skip[fn] = True
8849 80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1416 if copy:
80cc4b1a62d0 compare grep result between target and its parent FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 8834 diff changeset	1417 skip[copy] = True
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1418 del matches[rev]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	1419 del revfiles[rev]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1420
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1421 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	1422 """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	1423
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1424 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	1425
9502 8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1426 Repository "heads" are changesets with no child changesets. They are
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1427 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	1428 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	1429 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	1430
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1431 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	1432 associated with the specified changesets are shown.
9502 8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1433
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1434 If -c/--closed is specified, also show branch heads marked closed
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1435 (see hg commit --close-branch).
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1436
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1437 If STARTREV is specified, only those heads that are descendants of
8d7d68dd91fd commands: tweak help for 'heads'. Greg Ward <greg-hg@gerg.ca> parents: 9189 diff changeset	1438 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	1439
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1440 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	1441 changesets without children will be shown.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1442 """
10328 0798a3d5f812 commands: simplify heads a little bit before I start hacking it up Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10326 diff changeset	1443
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1444 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	1445 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	1446 else:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1447 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	1448
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1449 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	1450 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	1451 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	1452 heads = []
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1453 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	1454 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	1455 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	1456 continue
0fc5222c0951 commands: externalize branchheads so we can do it for all branches at once Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10347 diff changeset	1457 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	1458 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	1459 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	1460 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	1461 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	1462
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1463 if branchrevs:
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1464 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	1465 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	1466 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	1467
10349 20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1468 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	1469 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	1470
20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1471 if opts.get('active') and branchrevs:
20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1472 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	1473 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	1474
20356e69710c commands: actually implement --closed for topological heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10348 diff changeset	1475 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	1476 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	1477 if branches - haveheads:
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1478 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	1479 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	1480 if opts.get('rev'):
e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	1481 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	1482 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	1483
4648 8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1484 if not heads:
8e503fa54d2d Add option to heads to show only heads for current branch. Eric Hopper <hopper@omnifarious.org> parents: 4646 diff changeset	1485 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	1486
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	1487 heads = sorted(heads, key=lambda x: -x.rev())
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3631 diff changeset	1488 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	1489 for ctx in heads:
ec5240a22f4a commands: always order heads recent to oldest Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10330 diff changeset	1490 displayer.show(ctx)
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	1491 displayer.close()
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1492
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1493 def help_(ui, name=None, with_version=False, unknowncmd=False):
7210 833d1250ce00 help: update help Matt Mackall <mpm@selenic.com> parents: 7197 diff changeset	1494 """show help for a given topic or a help overview
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1495
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1496 With no arguments, print a list of commands with short help messages.
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1497
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1498 Given a topic, extension, or command name, print help for that
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1499 topic."""
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1500 option_lists = []
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	1501 textwidth = util.termwidth() - 2
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1502
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: 4267 diff changeset	1503 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: 4267 diff changeset	1504 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: 4267 diff changeset	1505 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: 4267 diff changeset	1506 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: 4267 diff changeset	1507 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: 4267 diff changeset	1508 '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: 4267 diff changeset	1509 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: 4267 diff changeset	1510 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: 4267 diff changeset	1511 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: 4267 diff changeset	1512 '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: 4267 diff changeset	1513 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: 4267 diff changeset	1514 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: 4267 diff changeset	1515 '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: 4267 diff changeset	1516 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: 4267 diff changeset	1517 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: 4267 diff changeset	1518 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: 4267 diff changeset	1519
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1520 def helpcmd(name):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1521 if with_version:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1522 version_(ui)
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1523 ui.write('\n')
6652 ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6642 diff changeset	1524
ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6642 diff changeset	1525 try:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1526 aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd)
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1527 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	1528 # 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	1529 # 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	1530 prefix = inst.args[0]
8e34f363dd77 compat: don't reference an exception var inside a lambda Alejandro Santos <alejolp@alejolp.com> parents: 9031 diff changeset	1531 select = lambda c: c.lstrip('^').startswith(prefix)
6652 ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6642 diff changeset	1532 helplist(_('list of commands:\n\n'), select)
ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6642 diff changeset	1533 return
ffcf8e82f647 help: enable listing of a subset of the command list Johannes Stezenbach <js@sig21.net> parents: 6642 diff changeset	1534
10021 0022f5c5459e help: don't display bogus help messages for invalid aliases Brodie Rao <me+hg@dackz.net> parents: 10015 diff changeset	1535 # 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	1536 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	1537 if not unknowncmd:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1538 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	1539 return
0022f5c5459e help: don't display bogus help messages for invalid aliases Brodie Rao <me+hg@dackz.net> parents: 10015 diff changeset	1540
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1541 # synopsis
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1542 if len(entry) > 2:
cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1543 if entry[2].startswith('hg'):
cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1544 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	1545 else:
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1546 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	1547 else:
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	1548 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	1549
28d9f8cd02f2 Move aliases section in help below synopsis (issue362) Thomas Arendsen Hein <thomas@intevation.de> parents: 5781 diff changeset	1550 # aliases
28d9f8cd02f2 Move aliases section in help below synopsis (issue362) Thomas Arendsen Hein <thomas@intevation.de> parents: 5781 diff changeset	1551 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	1552 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1553
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1554 # description
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1555 doc = gettext(entry[0].__doc__)
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1556 if not doc:
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7596 diff changeset	1557 doc = _("(no help text available)")
10564 6ded6243bde2 alias: fixes exception when displaying translated help text Yuya Nishihara <yuya@tcha.org> parents: 10559 diff changeset	1558 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	1559 doc = _('alias for: hg %s\n\n%s') % (entry[0].definition, doc)
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1560 if ui.quiet:
9136 31177742f54a for calls expecting bool args, pass bool instead of int Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9102 diff changeset	1561 doc = doc.splitlines()[0]
10445 8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1562 keep = ui.verbose and ['verbose'] or []
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1563 formatted, pruned = minirst.format(doc, textwidth, keep=keep)
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1564 ui.write("\n%s\n" % formatted)
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1565 if pruned:
8b45102934e2 commands: support verbose help Martin Geisler <mg@lazybytes.net> parents: 10413 diff changeset	1566 ui.write(_('\nuse "hg -v help %s" to show verbose help\n') % name)
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1567
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1568 if not ui.quiet:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1569 # options
9901 cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1570 if entry[1]:
cb2a1836c50a commands: minor refactoring Henri Wiechers <hwiechers@gmail.com> parents: 9894 diff changeset	1571 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: 4267 diff changeset	1572
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: 4267 diff changeset	1573 addglobalopts(False)
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1574
4950 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1575 def helplist(header, select=None):
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1576 h = {}
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1577 cmds = {}
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7598 diff changeset	1578 for c, e in table.iteritems():
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1579 f = c.split("\|", 1)[0]
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1580 if select and not select(f):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1581 continue
7197 f60730693efc help: show extension commands in short list, separate extension list in help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7196 diff changeset	1582 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	1583 e[0].__module__ != __name__):
7126 111813de4188 remove extension commands from global help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7125 diff changeset	1584 continue
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1585 if name == "shortlist" and not f.startswith("^"):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1586 continue
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1587 f = f.lstrip("^")
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1588 if not ui.debugflag and f.startswith("debug"):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1589 continue
9128 98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1590 doc = e[0].__doc__
98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1591 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	1592 continue
98d90ad54749 commands: hide deprecated commands. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9097 diff changeset	1593 doc = gettext(doc)
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1594 if not doc:
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7596 diff changeset	1595 doc = _("(no help text available)")
9136 31177742f54a for calls expecting bool args, pass bool instead of int Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 9102 diff changeset	1596 h[f] = doc.splitlines()[0].rstrip()
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1597 cmds[f] = c.lstrip("^")
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1598
4950 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1599 if not h:
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1600 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: 4942 diff changeset	1601 return
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1602
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1603 ui.status(header)
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	1604 fns = sorted(h)
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1605 m = max(map(len, fns))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1606 for f in fns:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1607 if ui.verbose:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1608 commands = cmds[f].replace("\|",", ")
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1609 ui.write(" %s:\n %s\n"%(commands, h[f]))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1610 else:
8938 9b8c9266c59d commands: wrap short descriptions in 'hg help' Martin Geisler <mg@lazybytes.net> parents: 8937 diff changeset	1611 ui.write(' %-*s %s\n' % (m, f, util.wrap(h[f], m + 4)))
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1612
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: 4267 diff changeset	1613 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: 4267 diff changeset	1614 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: 4267 diff changeset	1615
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1616 def helptopic(name):
7012 78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1617 for names, header, doc in help.helptable:
78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1618 if name in names:
78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1619 break
78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1620 else:
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1621 raise error.UnknownCommand(name)
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1622
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1623 # description
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1624 if not doc:
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7596 diff changeset	1625 doc = _("(no help text available)")
8366 0bf0045000b5 some modernization cleanups, forward compatibility Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8313 diff changeset	1626 if hasattr(doc, '__call__'):
3796 58133ba5847d Allow topics to be callables Matt Mackall <mpm@selenic.com> parents: 3795 diff changeset	1627 doc = doc()
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1628
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	1629 ui.write("%s\n\n" % header)
9540 cad36e496640 help: un-indent help topics Martin Geisler <mg@lazybytes.net> parents: 9537 diff changeset	1630 ui.write("%s\n" % minirst.format(doc, textwidth, indent=4))
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1631
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1632 def helpext(name):
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1633 try:
4544 930ed513c864 Create a separate module for managing extensions Matt Mackall <mpm@selenic.com> parents: 4543 diff changeset	1634 mod = extensions.find(name)
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1635 doc = gettext(mod.__doc__) or _('no help text available')
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1636 except KeyError:
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1637 mod = None
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1638 doc = extensions.disabledext(name)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1639 if not doc:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1640 raise error.UnknownCommand(name)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1641
9280 b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9249 diff changeset	1642 if '\n' not in doc:
b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9249 diff changeset	1643 head, tail = doc, ""
b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9249 diff changeset	1644 else:
b694531a5aa7 commands: Check if helptext contains a newline before we split David Soria Parra <dsp@php.net> parents: 9249 diff changeset	1645 head, tail = doc.split('\n', 1)
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	1646 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: 9142 diff changeset	1647 if tail:
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	1648 ui.write(minirst.format(tail, textwidth))
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	1649 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: 3915 diff changeset	1650
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1651 if mod:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1652 try:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1653 ct = mod.cmdtable
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1654 except AttributeError:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1655 ct = {}
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1656 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	1657 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	1658 else:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1659 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	1660 'extensions\n'))
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1661
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1662 def helpextcmd(name):
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1663 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	1664 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	1665
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1666 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	1667 "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	1668 indent=4)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1669 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	1670 ui.write('\n\n')
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1671 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	1672 'extensions\n'))
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1673
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1674 if name and name != 'shortlist':
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1675 i = None
10364 de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1676 if unknowncmd:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1677 queries = (helpextcmd,)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1678 else:
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1679 queries = (helptopic, helpcmd, helpext, helpextcmd)
de1e7099d100 dispatch: provide help for disabled extensions and commands Brodie Rao <me+hg@dackz.net> parents: 10355 diff changeset	1680 for f in queries:
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1681 try:
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1682 f(name)
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1683 i = None
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1684 break
7643 9a1ea6587557 error: move UnknownCommand and AmbiguousCommand Matt Mackall <mpm@selenic.com> parents: 7637 diff changeset	1685 except error.UnknownCommand, inst:
3795 17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1686 i = inst
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1687 if i:
17a11f4ff260 Add basic support for help topics and a dates topic Matt Mackall <mpm@selenic.com> parents: 3786 diff changeset	1688 raise i
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1689
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1690 else:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1691 # program name
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1692 if ui.verbose or with_version:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1693 version_(ui)
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1694 else:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1695 ui.status(_("Mercurial Distributed SCM\n"))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1696 ui.status('\n')
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1697
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1698 # list of commands
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1699 if name == "shortlist":
4950 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1700 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: 4267 diff changeset	1701 else:
4950 93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1702 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: 4942 diff changeset	1703
93b7e2fa7ee3 help: avoid traceback if an extension has only debug commands Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4942 diff changeset	1704 helplist(header)
9839 0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	1705 if name != 'shortlist':
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	1706 exts, maxlength = extensions.enabled()
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	1707 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	1708 if text:
0a3fc37261ab help: don't show extension list on extension help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9831 diff changeset	1709 ui.write("\n%s\n" % minirst.format(text, textwidth))
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1710
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1711 # list all option lists
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1712 opt_output = []
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1713 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: 4267 diff changeset	1714 opt_output.append(("\n%s" % title, None))
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1715 for shortopt, longopt, default, desc in options:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	1716 if _("DEPRECATED") in desc and not ui.verbose:
10339 23e608f42f2c fix spaces/identation issues Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10331 diff changeset	1717 continue
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1718 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1719 longopt and " --%s" % longopt),
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1720 "%s%s" % (desc,
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1721 default
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1722 and _(" (default: %s)") % default
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1723 or "")))
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1724
7196 3f6a4f1de43f help: show help topics by default in 'hg help', with longest available id Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7185 diff changeset	1725 if not name:
7210 833d1250ce00 help: update help Matt Mackall <mpm@selenic.com> parents: 7197 diff changeset	1726 ui.write(_("\nadditional help topics:\n\n"))
6653 a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6652 diff changeset	1727 topics = []
7012 78341ea65d16 restructure helptable Martin Geisler <mg@daimi.au.dk> parents: 7006 diff changeset	1728 for names, header, doc in help.helptable:
9537 460e410c39be commands: simpler sort of help topic names Martin Geisler <mg@lazybytes.net> parents: 9508 diff changeset	1729 topics.append((sorted(names, key=len, reverse=True)[0], header))
6653 a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6652 diff changeset	1730 topics_len = max([len(s[0]) for s in topics])
a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6652 diff changeset	1731 for t, desc in topics:
a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6652 diff changeset	1732 ui.write(" %-*s %s\n" % (topics_len, t, desc))
a78d8edaeedd help: list special help topics with -v Johannes Stezenbach <js@sig21.net> parents: 6652 diff changeset	1733
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1734 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: 4267 diff changeset	1735 opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0])
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1736 for first, second in opt_output:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1737 if second:
8938 9b8c9266c59d commands: wrap short descriptions in 'hg help' Martin Geisler <mg@lazybytes.net> parents: 8937 diff changeset	1738 second = util.wrap(second, opts_len + 3)
9b8c9266c59d commands: wrap short descriptions in 'hg help' Martin Geisler <mg@lazybytes.net> parents: 8937 diff changeset	1739 ui.write(" %-*s %s\n" % (opts_len, first, second))
3655 da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1740 else:
da361aa7a118 alphabetize help_ in commands Matt Mackall <mpm@selenic.com> parents: 3654 diff changeset	1741 ui.write("%s\n" % first)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1742
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	1743 def identify(ui, repo, source=None,
150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	1744 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	1745 """identify the working copy or specified revision
091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	1746
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1747 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	1748 repository.
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	1749
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1750 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	1751 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	1752
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1753 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	1754 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	1755 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	1756 this revision and a branch name for non-default branches.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1757 """
4662 f9b8ea362b49 identify: show nullid for empty repo Matt Mackall <mpm@selenic.com> parents: 4659 diff changeset	1758
5330 4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	1759 if not repo and not source:
4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	1760 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	1761 "(.hg not found)"))
4528858e7202 make identify an optionalrepo command Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5329 diff changeset	1762
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2963 diff changeset	1763 hexfunc = ui.debugflag and hex or short
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1764 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	1765 output = []
4664 dedb8abfd0e1 identify: use contexts Matt Mackall <mpm@selenic.com> parents: 4662 diff changeset	1766
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	1767 revs = []
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	1768 if source:
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	1769 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	1770 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	1771 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	1772
af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	1773 if not repo.local():
4671 150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	1774 if not rev and revs:
150afe6becf6 identify: take a path to a remote repo Matt Mackall <mpm@selenic.com> parents: 4667 diff changeset	1775 rev = revs[0]
4667 c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	1776 if not rev:
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	1777 rev = "tip"
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	1778 if num or branch or tags:
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	1779 raise util.Abort(
c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	1780 "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	1781 output = [hexfunc(repo.lookup(rev))]
4667 c7a81e3ae80f identify: work with remote repos Matt Mackall <mpm@selenic.com> parents: 4666 diff changeset	1782 elif not rev:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	1783 ctx = repo[None]
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	1784 parents = ctx.parents()
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1785 changed = False
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1786 if default or id or num:
10515 98bc3e195720 identify: don't include unknown in status Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10505 diff changeset	1787 changed = util.any(repo.status())
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1788 if default or id:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1789 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	1790 (changed) and "+" or "")]
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1791 if num:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1792 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	1793 (changed) and "+" or ""))
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	1794 else:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	1795 ctx = repo[rev]
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1796 if default or id:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1797 output = [hexfunc(ctx.node())]
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1798 if num:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1799 output.append(str(ctx.rev()))
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1800
7757 af6a63438a8a identify: have consistent output for local repositories Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7743 diff changeset	1801 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	1802 b = encoding.tolocal(ctx.branch())
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1803 if b != 'default':
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1804 output.append("(%s)" % b)
3415 9a6491770b04 Report branch for hg id Matt Mackall <mpm@selenic.com> parents: 3414 diff changeset	1805
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1806 # 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	1807 t = "/".join(ctx.tags())
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1808 if t:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1809 output.append(t)
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1810
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1811 if branch:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	1812 output.append(encoding.tolocal(ctx.branch()))
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1813
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1814 if tags:
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	1815 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	1816
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1817 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	1818
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1819 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	1820 """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	1821
9649 20b91f91f9ca minor documentation improvements timeless@mozdev.org parents: 9646 diff changeset	1822 Import a list of patches and commit them individually (unless
20b91f91f9ca minor documentation improvements timeless@mozdev.org parents: 9646 diff changeset	1823 --no-commit is specified).
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1824
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1825 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	1826 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	1827
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	1828 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	1829 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	1830 text/plain or text/x-patch). From and Subject headers of email
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	1831 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	1832 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	1833 message.
2504 158d3d2ae070 import: parse email messages Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2494 diff changeset	1834
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1835 If the imported patch was generated by hg export, user and
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1836 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	1837 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	1838 override these.
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1839
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1840 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	1841 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	1842 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	1843 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	1844 deficiencies in the text patch format.
4263 47ba52121433 Add import --exact. Brendan Cully <brendan@kublai.com> parents: 4256 diff changeset	1845
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	1846 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	1847 copies in the patch in the same way as 'addremove'.
7402 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1848
8931 4c99eafb101e commands: add note about import retrieving patches from URLs Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8927 diff changeset	1849 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	1850 a URL is specified, the patch will be downloaded from it.
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	1851 See 'hg help dates' for a list of formats valid for -d/--date.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1852 """
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1853 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1854
6139 989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	1855 date = opts.get('date')
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	1856 if date:
989467e8e3a9 Fix bad behaviour when specifying an invalid date (issue700) Thomas Arendsen Hein <thomas@intevation.de> parents: 6134 diff changeset	1857 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	1858
7402 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1859 try:
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1860 sim = float(opts.get('similarity') or 0)
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1861 except ValueError:
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1862 raise util.Abort(_('similarity must be a number'))
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1863 if sim < 0 or sim > 100:
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	1864 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	1865
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	1866 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	1867 cmdutil.bail_if_changed(repo)
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1868
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1869 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1870 strip = opts["strip"]
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1871 wlock = lock = None
10384 832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1872
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1873 def tryone(ui, hunk):
10413 e433002acb05 fix up a bunch of check-code warnings Matt Mackall <mpm@selenic.com> parents: 10405 diff changeset	1874 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	1875 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: 10379 diff changeset	1876
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1877 if not tmpname:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1878 return None
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1879 commitid = _('to working directory')
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1880
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1881 try:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1882 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: 10379 diff changeset	1883 if cmdline_message:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1884 # pickup the cmdline msg
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1885 message = cmdline_message
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1886 elif message:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1887 # pickup the patch msg
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1888 message = message.strip()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1889 else:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1890 # launch the editor
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1891 message = None
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1892 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: 10379 diff changeset	1893
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1894 wp = repo.parents()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1895 if opts.get('exact'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1896 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: 10379 diff changeset	1897 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: 10379 diff changeset	1898 p1 = repo.lookup(p1)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1899 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: 10379 diff changeset	1900
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1901 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: 10379 diff changeset	1902 hg.clean(repo, p1)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1903 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: 10379 diff changeset	1904 elif p2:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1905 try:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1906 p1 = repo.lookup(p1)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1907 p2 = repo.lookup(p2)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1908 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: 10379 diff changeset	1909 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: 10379 diff changeset	1910 except error.RepoError:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1911 pass
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1912 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: 10379 diff changeset	1913 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: 10379 diff changeset	1914
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1915 files = {}
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1916 try:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1917 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: 10379 diff changeset	1918 files=files, eolmode=None)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1919 finally:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1920 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: 10379 diff changeset	1921 similarity=sim / 100.0)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1922 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: 10379 diff changeset	1923 if opts.get('exact'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1924 m = None
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1925 else:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1926 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: 10379 diff changeset	1927 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: 10379 diff changeset	1928 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: 10379 diff changeset	1929 editor=cmdutil.commiteditor)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1930 if opts.get('exact'):
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1931 if hex(n) != nodeid:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1932 repo.rollback()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1933 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: 10379 diff changeset	1934 ' or loses information'))
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1935 # 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: 10379 diff changeset	1936 # 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: 10379 diff changeset	1937 repo.dirstate.write()
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1938 if n:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1939 commitid = short(n)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1940
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1941 return commitid
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1942 finally:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1943 os.unlink(tmpname)
10405 2d30d66a89ad whitespace cleanup Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 10394 diff changeset	1944
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1945 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1946 wlock = repo.wlock()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1947 lock = repo.lock()
10384 832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1948 lastcommit = None
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1949 for p in patches:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1950 pf = os.path.join(d, p)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1951
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1952 if pf == '-':
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1953 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	1954 pf = sys.stdin
2400 2e90024e1471 import: allow to import stdin with file name "-" Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2397 diff changeset	1955 else:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1956 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	1957 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: 10379 diff changeset	1958
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1959 haspatch = False
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1960 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: 10379 diff changeset	1961 commitid = tryone(ui, hunk)
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1962 if commitid:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1963 haspatch = True
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1964 if lastcommit:
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1965 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: 10379 diff changeset	1966 lastcommit = commitid
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1967
832f35386067 import: import each patch in a file or stream as a separate change Brendan Cully <brendan@kublai.com> parents: 10379 diff changeset	1968 if not haspatch:
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1969 raise util.Abort(_('no diffs found'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1970
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	1971 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	1972 release(lock, wlock)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1973
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1974 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	1975 """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	1976
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	1977 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	1978 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	1979 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	1980
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	1981 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	1982 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	1983
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	1984 See pull for valid source format details.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1985 """
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	1986 limit = cmdutil.loglimit(opts)
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	1987 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	1988 other = hg.repository(cmdutil.remoteui(repo, opts), source)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	1989 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	1990 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	1991 if revs:
5259 65dc707606ed Push capability checking into protocol-level code. Bryan O'Sullivan <bos@serpentine.com> parents: 5248 diff changeset	1992 revs = [other.lookup(rev) for rev in revs]
7415 6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	1993 common, incoming, rheads = repo.findcommonincoming(other, heads=revs,
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	1994 force=opts["force"])
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1995 if not incoming:
3933 7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	1996 try:
7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	1997 os.unlink(opts["bundle"])
7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	1998 except:
7997c0e01bfc hg in: if no incoming csets, remove existing bundle Matt Mackall <mpm@selenic.com> parents: 3931 diff changeset	1999 pass
1993 fb6ca9801d04 show message if no changes found on incoming TK Soh <teekaysoh@yahoo.com> parents: 1981 diff changeset	2000 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	2001 return 1
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2002
fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2003 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	2004 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	2005 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	2006 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	2007 # 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	2008
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	2009 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	2010 revs = rheads
6163ef936a00 protocol: use changegroupsubset() if possible (issue1389) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7414 diff changeset	2011
4451 671158f060cc Make "hg incoming -r revision_number" work for remote repos (issue566) Thomas Arendsen Hein <thomas@intevation.de> parents: 4324 diff changeset	2012 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	2013 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	2014 else:
671158f060cc Make "hg incoming -r revision_number" work for remote repos (issue566) Thomas Arendsen Hein <thomas@intevation.de> parents: 4324 diff changeset	2015 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	2016 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	2017 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	2018 # 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	2019 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	2020 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	2021 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	2022 # 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	2023 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	2024
2521 9cceb439048b add -r/--rev arguments to incoming and outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2515 diff changeset	2025 o = other.changelog.nodesbetween(incoming, revs)[0]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2026 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	2027 o.reverse()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3631 diff changeset	2028 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	2029 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	2030 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	2031 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	2032 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	2033 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	2034 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	2035 continue
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2036 count += 1
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7364 diff changeset	2037 displayer.show(other[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2038 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	2039 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	2040 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	2041 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	2042 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	2043 os.unlink(cleanup)
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2044
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	2045 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	2046 """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	2047
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	2048 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	2049 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	2050
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2051 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	2052
9970 36760956f6d3 commands: mark "ssh://" as inline literals in help texts Martin Geisler <mg@lazybytes.net> parents: 9952 diff changeset	2053 It is possible to specify an ``ssh://`` URL as the destination.
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	2054 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	2055 """
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	2056 hg.repository(cmdutil.remoteui(ui, opts), dest, create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	2057
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	2058 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	2059 """locate files matching specific patterns
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2060
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2061 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	2062 names match the given patterns.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2063
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2064 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	2065 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	2066 subdirectories, use "--include .".
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2067
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2068 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	2069 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	2070
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2071 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	2072 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	2073 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	2074 contain whitespace as multiple filenames.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2075 """
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2076 end = opts.get('print0') and '\0' or '\n'
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2077 rev = opts.get('rev') or None
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	2078
4196 1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4195 diff changeset	2079 ret = 1
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2080 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	2081 m.bad = lambda x, y: False
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2082 for abs in repo[rev].walk(m):
8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2083 if not rev and abs not in repo.dirstate:
4308 a5cde03cd019 locate: don't print "file not found" messages. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4252 diff changeset	2084 continue
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2085 if opts.get('fullpath'):
7570 e05aa73ce2b7 use repo.wjoin(f) instead of os.path.join(repo.root, f) Martin Geisler <mg@daimi.au.dk> parents: 7540 diff changeset	2086 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	2087 else:
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	2088 ui.write(((pats and m.rel(abs)) or abs), end)
4196 1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4195 diff changeset	2089 ret = 0
1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4195 diff changeset	2090
1c69c73d85d9 locate: exit(1) if we didn't print any file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4195 diff changeset	2091 return ret
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	2092
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	2093 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	2094 """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	2095
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2096 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	2097 project.
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2098
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2739 diff changeset	2099 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	2100 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	2101 renames and copies. --follow without a filename will only show
2784 12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2783 diff changeset	2102 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: 2783 diff changeset	2103 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	2104
2783 2e0cd25fe4ac Make log --follow revision range start default to working dir parent. Brendan Cully <brendan@kublai.com> parents: 2782 diff changeset	2105 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: 2782 diff changeset	2106 --follow is set, in which case the working directory parent is
2e0cd25fe4ac Make log --follow revision range start default to working dir parent. Brendan Cully <brendan@kublai.com> parents: 2782 diff changeset	2107 used as the starting revision.
2e0cd25fe4ac Make log --follow revision range start default to working dir parent. Brendan Cully <brendan@kublai.com> parents: 2782 diff changeset	2108
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	2109 See 'hg help dates' for a list of formats valid for -d/--date.
1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	2110
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2111 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	2112 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	2113 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	2114 changed files and full commit message are shown.
3822 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2115
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2116 NOTE: log -p/--patch may generate unexpected diff output for merge
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	2117 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	2118 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	2119 will appear in files:.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2120 """
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2121
9652 2cb0cab10d2e walkchangerevs: pull out matchfn Matt Mackall <mpm@selenic.com> parents: 9625 diff changeset	2122 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	2123 limit = cmdutil.loglimit(opts)
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2124 count = 0
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2125
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2126 endrev = None
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2127 if opts.get('copies') and opts.get('rev'):
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2128 endrev = max(cmdutil.revrange(repo, opts.get('rev'))) + 1
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 3194 diff changeset	2129
3813 fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3812 diff changeset	2130 df = False
fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3812 diff changeset	2131 if opts["date"]:
fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3812 diff changeset	2132 df = util.matchdate(opts["date"])
fc5ba0ab7f45 Add --date support to log Matt Mackall <mpm@selenic.com> parents: 3812 diff changeset	2133
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3833 diff changeset	2134 displayer = cmdutil.show_changeset(ui, repo, opts, True, matchfn)
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2135 def prep(ctx, fns):
9655 6d7d3f849062 walkchangerevs: internalize ctx caching Matt Mackall <mpm@selenic.com> parents: 9654 diff changeset	2136 rev = ctx.rev()
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2137 parents = [p for p in repo.changelog.parentrevs(rev)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2138 if p != nullrev]
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2139 if opts.get('no_merges') and len(parents) == 2:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2140 return
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2141 if opts.get('only_merges') and len(parents) != 2:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2142 return
9663 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	2143 if opts.get('only_branch') and ctx.branch() not in opts['only_branch']:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2144 return
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2145 if df and not df(ctx.date()[0]):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2146 return
9663 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	2147 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: 9662 diff changeset	2148 return
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2149 if opts.get('keyword'):
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2150 for k in [kw.lower() for kw in opts['keyword']]:
9663 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	2151 if (k in ctx.user().lower() or
4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	2152 k in ctx.description().lower() or
4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	2153 k in " ".join(ctx.files()).lower()):
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2154 break
9663 4164a17e7126 log: tidy up some filter tests Matt Mackall <mpm@selenic.com> parents: 9662 diff changeset	2155 else:
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2156 return
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2157
10060 f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2158 copies = None
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2159 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	2160 copies = []
f780b1098efc templatekw: change {file_copies} behaviour, add {file_copies_switch} Patrick Mezard <pmezard@gmail.com> parents: 10021 diff changeset	2161 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev)
9662 f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2162 for fn in ctx.files():
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2163 rename = getrenamed(fn, rev)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2164 if rename:
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2165 copies.append((fn, rename[0]))
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2166
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2167 displayer.show(ctx, copies=copies)
f3d60543924f walkchangerevs: move 'add' to callback Matt Mackall <mpm@selenic.com> parents: 9656 diff changeset	2168
9665 1de5ebfa5585 walkchangerevs: drop ui arg Matt Mackall <mpm@selenic.com> parents: 9663 diff changeset	2169 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	2170 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	2171 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	2172 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	2173 count += 1
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2174 displayer.close()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2175
5155 13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2176 def manifest(ui, repo, node=None, rev=None):
3914 283ee8971570 doc string fix: hg cat and manifest default to current parent revision. Thomas Arendsen Hein <thomas@intevation.de> parents: 3900 diff changeset	2177 """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	2178
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2179 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	2180 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	2181 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	2182
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2183 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	2184 With --debug, print file revision hashes.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2185 """
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2186
5155 13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2187 if rev and node:
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2188 raise util.Abort(_("please specify just one revision"))
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2189
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2190 if not node:
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2191 node = rev
13d23d66a6cd manifest: accept -r for rev specification Bryan O'Sullivan <bos@serpentine.com> parents: 5148 diff changeset	2192
6749 51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2193 decor = {'l':'644 @ ', 'x':'755 * ', '':'644 '}
51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2194 ctx = repo[node]
51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2195 for f in ctx:
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2196 if ui.debugflag:
6749 51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2197 ui.write("%40s " % hex(ctx.manifest()[f]))
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2198 if ui.verbose:
6749 51b0e799352f manifest: remove execf/linkf methods Matt Mackall <mpm@selenic.com> parents: 6748 diff changeset	2199 ui.write(decor[ctx.flags(f)])
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 3707 diff changeset	2200 ui.write("%s\n" % f)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2201
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2202 def merge(ui, repo, node=None, **opts):
4014 509342f95564 various doc fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4013 diff changeset	2203 """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	2204
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2205 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	2206 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	2207
1cd3775e097c commands: better merge help text Martin Geisler <mg@daimi.au.dk> parents: 7976 diff changeset	2208 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	2209 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	2210 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	2211 two parents.
2915 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2911 diff changeset	2212
013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2911 diff changeset	2213 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	2214 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	2215 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	2216 explicit revision with which to merge with must be provided.
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2217 """
2806 0bf22c109cc3 Factor doupdate into _lookup + hg.update Matt Mackall <mpm@selenic.com> parents: 2803 diff changeset	2218
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2219 if opts.get('rev') and node:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	2220 raise util.Abort(_("please specify just one revision"))
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	2221 if not node:
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2222 node = opts.get('rev')
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	2223
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	2224 if not node:
6740 b148e9099133 use repo.changectx(None) to get a workingctx Matt Mackall <mpm@selenic.com> parents: 6739 diff changeset	2225 branch = repo.changectx(None).branch()
6844 a38dff85d31f merge: use correct branch name for counting heads Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6843 diff changeset	2226 bheads = repo.branchheads(branch)
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2227 if len(bheads) > 2:
10355 a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2228 ui.warn(_("abort: branch '%s' has %d heads - "
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2229 "please merge with an explicit rev\n")
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2230 % (branch, len(bheads)))
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2231 ui.status(_("(run 'hg heads .' to see heads)\n"))
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2232 return False
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2233
5242 9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5205 diff changeset	2234 parent = repo.dirstate.parents()[0]
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2235 if len(bheads) == 1:
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2236 if len(repo.heads()) > 1:
10355 a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2237 ui.warn(_("abort: branch '%s' has one head - "
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2238 "please merge with an explicit rev\n" % branch))
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2239 ui.status(_("(run 'hg heads' to see all heads)\n"))
a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10350 diff changeset	2240 return False
5242 9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5205 diff changeset	2241 msg = _('there is nothing to merge')
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	2242 if parent != repo.lookup(repo[None].branch()):
5542 253736bb0dc9 i18n: fix complaints from pygettext Matt Mackall <mpm@selenic.com> parents: 5525 diff changeset	2243 msg = _('%s - use "hg update" instead') % msg
5242 9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5205 diff changeset	2244 raise util.Abort(msg)
9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5205 diff changeset	2245
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6686 diff changeset	2246 if parent not in bheads:
2915 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2911 diff changeset	2247 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: 2911 diff changeset	2248 '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	2249 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	2250
8834 6d36fc70754e merge: rename -S/--show option to -P/--preview Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8815 diff changeset	2251 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	2252 # 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	2253 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	2254 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	2255 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	2256
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2257 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	2258 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	2259 displayer.show(repo[node])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2260 displayer.close()
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2261 return 0
50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2262
50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	2263 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	2264
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2493 diff changeset	2265 def outgoing(ui, repo, dest=None, **opts):
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2266 """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	2267
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2268 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	2269 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	2270 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	2271
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2272 See pull for details of valid destination formats.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2273 """
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2274 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	2275 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2276 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	2277 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	2278 if revs:
b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2279 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	2280
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	2281 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2282 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2283 o = repo.findoutgoing(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	2284 if not o:
78ef83c9e9e1 show message if no changes found on outgoing Thomas Arendsen Hein <thomas@intevation.de> parents: 1993 diff changeset	2285 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	2286 return 1
2521 9cceb439048b add -r/--rev arguments to incoming and outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2515 diff changeset	2287 o = repo.changelog.nodesbetween(o, revs)[0]
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2288 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	2289 o.reverse()
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3631 diff changeset	2290 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	2291 count = 0
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2292 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	2293 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	2294 break
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2295 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	2296 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	2297 continue
6191 01594b0c86e2 Add option -l/--limit to hg incoming and hg outgoing. Thomas Arendsen Hein <thomas@intevation.de> parents: 6190 diff changeset	2298 count += 1
7369 87158be081b8 cmdutil: use change contexts for cset-printer and cset-templater Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7364 diff changeset	2299 displayer.show(repo[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2300 displayer.close()
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2301
3658 d12c8668b102 remove legacy hg parents REV syntax Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	2302 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	2303 """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	2304
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2305 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	2306 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	2307 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	2308 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	2309 argument to --rev if given) is printed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2310 """
3658 d12c8668b102 remove legacy hg parents REV syntax Matt Mackall <mpm@selenic.com> parents: 3657 diff changeset	2311 rev = opts.get('rev')
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2312 if rev:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	2313 ctx = repo[rev]
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2314 else:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	2315 ctx = repo[None]
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2316
4586 1fcc076fcb17 Make parents with a file but not a revision use working directory revision. Brendan Cully <brendan@kublai.com> parents: 4451 diff changeset	2317 if file_:
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2318 m = cmdutil.match(repo, (file_,), opts)
5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2319 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	2320 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	2321 file_ = m.files()[0]
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2322 filenodes = []
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2323 for cp in ctx.parents():
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2324 if not cp:
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2325 continue
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2326 try:
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2327 filenodes.append(cp.filenode(file_))
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7632 diff changeset	2328 except error.LookupError:
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2329 pass
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2330 if not filenodes:
cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2331 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: 5230 diff changeset	2332 fl = repo.file(file_)
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7308 diff changeset	2333 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	2334 else:
5298 cba2a689117d parents: make it match the doc when called on a file Patrick Mezard <pmezard@gmail.com> parents: 5230 diff changeset	2335 p = [cp.node() for cp in ctx.parents()]
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2336
3643 b4ad640a3bcf templates: move changeset templating bits to cmdutils Matt Mackall <mpm@selenic.com> parents: 3631 diff changeset	2337 displayer = cmdutil.show_changeset(ui, repo, opts)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2338 for n in p:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2339 if n != nullid:
7743 ec9b726a9428 commands: fix paths command docstring indention Martin Geisler <mg@daimi.au.dk> parents: 7739 diff changeset	2340 displayer.show(repo[n])
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	2341 displayer.close()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2342
1858 9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	2343 def paths(ui, repo, search=None):
7691 bcdc2fe3fd07 Clarified 'hg paths' command help Bill Barry <after.fallout@gmail.com> parents: 7684 diff changeset	2344 """show aliases for remote repositories
bcdc2fe3fd07 Clarified 'hg paths' command help Bill Barry <after.fallout@gmail.com> parents: 7684 diff changeset	2345
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2346 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	2347 show definition of all available names.
7743 ec9b726a9428 commands: fix paths command docstring indention Martin Geisler <mg@daimi.au.dk> parents: 7739 diff changeset	2348
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2349 Path names are defined in the [paths] section of /etc/mercurial/hgrc
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	2350 and $HOME/.hgrc. If run inside a 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	2351
11007 a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2352 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	2353 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	2354 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	2355 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	2356 ``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	2357 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	2358 source is written as ``default`` in ``.hg/hgrc``. Note that
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2359 ``default`` and ``default-push`` apply to all inbound (e.g. ``hg
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2360 incoming``) and outbound (e.g. ``hg outgoing``, ``hg email`` and
a0102da324ab commands: revised documentation of 'default' and 'default-push' Faheem Mitha <faheem@email.unc.edu> parents: 10948 diff changeset	2361 ``hg bundle``) operations.
10933 e3396b218e10 Document 'default' and 'default-push' in paths docstring Faheem Mitha <faheem@email.unc.edu> parents: 10645 diff changeset	2362
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	2363 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	2364 """
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2365 if search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2366 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2367 if name == search:
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2368 ui.write("%s\n" % url.hidepassword(path))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2369 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	2370 ui.warn(_("not found!\n"))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2371 return 1
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2372 else:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2373 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	2374 ui.write("%s = %s\n" % (name, url.hidepassword(path)))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2375
5224 20817af258d8 pull -u: if "url#rev" was given, update to rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5222 diff changeset	2376 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	2377 if modheads == 0:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2378 return
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2379 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	2380 if (modheads <= 1 or len(repo.branchheads()) == 1) or checkout:
5224 20817af258d8 pull -u: if "url#rev" was given, update to rev Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5222 diff changeset	2381 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	2382 else:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2383 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	2384 if modheads > 1:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2385 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	2386 else:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2387 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	2388
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	2389 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	2390 """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	2391
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2392 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	2393
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2394 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	2395 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	2396 -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	2397 project in the working directory.
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2398
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2399 Use hg incoming if you want to see what would have been added by a
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2400 pull at the time you issued this command. If you then decide to
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2401 added those changes to the repository, you should use pull -r X
708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	2402 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	2403
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	2404 If SOURCE is omitted, the 'default' path will be used.
e040f9d6b2f3 consolidated url help into urls help topic and added information about path aliases Bill Barry <after.fallout@gmail.com> parents: 7691 diff changeset	2405 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	2406 """
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2407 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	2408 other = hg.repository(cmdutil.remoteui(repo, opts), source)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2409 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	2410 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	2411 if revs:
5259 65dc707606ed Push capability checking into protocol-level code. Bryan O'Sullivan <bos@serpentine.com> parents: 5248 diff changeset	2412 try:
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2413 revs = [other.lookup(rev) for rev in revs]
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2414 except error.CapabilityError:
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2415 err = _("Other repository doesn't support revision lookup, "
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2416 "so a rev cannot be specified.")
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2417 raise util.Abort(err)
4478 b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2418
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2419 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	2420 if checkout:
02f40b2ece3f commands: use rev from remote repo when updating as part of a pull timeless@mozdev.org parents: 9644 diff changeset	2421 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	2422 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	2423
2494 73ac95671788 push, outgoing, bundle: fall back to "default" if "default-push" not defined Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2493 diff changeset	2424 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	2425 """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	2426
11217 1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2427 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	2428 destination.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2429
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2430 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	2431 in the destination repository from the current one.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2432
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2433 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	2434 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	2435 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	2436 before pushing.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2437
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2438 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	2439 changesets on all branches.
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2440
1b8aa9ffa7dc commands: updates to push docstring. Faheem Mitha <faheem@email.unc.edu> parents: 11103 diff changeset	2441 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	2442 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	2443
9970 36760956f6d3 commands: mark "ssh://" as inline literals in help texts Martin Geisler <mg@lazybytes.net> parents: 9952 diff changeset	2444 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	2445 URLs. If DESTINATION is omitted, a default path will be used.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2446 """
10365 d757bc0c7865 interpret repo#name url syntax as branch instead of revision Sune Foldager <cryo@cyanite.org> parents: 10364 diff changeset	2447 dest = ui.expandpath(dest or 'default-push', dest or 'default')
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	2448 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	2449 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
8188 f3abe032fc89 add cmdutil.remoteui Matt Mackall <mpm@selenic.com> parents: 8182 diff changeset	2450 other = hg.repository(cmdutil.remoteui(repo, opts), dest)
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7236 diff changeset	2451 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	2452 if revs:
b2b55acbacdd Add support for url#id syntax Matt Mackall <mpm@selenic.com> parents: 4474 diff changeset	2453 revs = [repo.lookup(rev) for rev in revs]
8815 e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2454
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2455 # push subrepos depth-first for coherent ordering
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2456 c = repo['']
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2457 subs = c.substate # only repos that are committed
e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2458 for s in sorted(subs):
11067 49e14ec67144 subrepo: propagate and catch push failures Matt Mackall <mpm@selenic.com> parents: 11007 diff changeset	2459 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	2460 return False
8815 e87b0fc4750b subrepo: basic push support Matt Mackall <mpm@selenic.com> parents: 8812 diff changeset	2461
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2462 r = repo.push(other, opts.get('force'), revs=revs)
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2463 return r == 0
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	2464
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2465 def recover(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2466 """roll back an interrupted transaction
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2467
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2468 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	2469
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2470 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	2471 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	2472 suggests it.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2473 """
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	2474 if repo.recover():
2778 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2776 diff changeset	2475 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	2476 return 1
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2477
2179 520dd3d28e9b add --after option to remove command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2175 diff changeset	2478 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	2479 """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	2480
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2481 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	2482
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2483 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	2484 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	2485 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	2486 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	2487 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	2488
d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2489 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	2490 file states (columns) and option combinations (rows). The file
9249 16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	2491 states are Added [A], Clean [C], Modified [M] and Missing [!] (as
16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	2492 reported by hg status). The actions are Warn, Remove (from branch)
16f4cfc69e4f commands: wrap docstrings at 70 characters Martin Geisler <mg@lazybytes.net> parents: 9219 diff changeset	2493 and Delete (from disk)::
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2494
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2495 A C M !
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2496 none W RD W R
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2497 -f R RD RD R
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2498 -A W W W R
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2499 -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	2500
3829 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3822 diff changeset	2501 This command schedules the files to be removed at the next commit.
531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3822 diff changeset	2502 To undo a remove before that, see hg revert.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2503 """
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2504
8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2505 after, force = opts.get('after'), opts.get('force')
8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2506 if not pats and not after:
2179 520dd3d28e9b add --after option to remove command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2175 diff changeset	2507 raise util.Abort(_('no files specified'))
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2508
6582 5acbdd3941c4 walk: remove remaining users of cmdutils.matchpats Matt Mackall <mpm@selenic.com> parents: 6579 diff changeset	2509 m = cmdutil.match(repo, pats, opts)
6761 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2510 s = repo.status(match=m, clean=True)
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2511 modified, added, deleted, clean = s[0], s[1], s[3], s[6]
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2512
8533 6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8464 diff changeset	2513 for f in m.files():
6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8464 diff changeset	2514 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: 8464 diff changeset	2515 ui.warn(_('not removing %s: file is untracked\n') % m.rel(f))
6062c6362b2e remove: warn if unversionned files are specified (issue1454) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8464 diff changeset	2516
6761 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2517 def warn(files, reason):
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2518 for f in files:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2519 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: 6760 diff changeset	2520 % (m.rel(f), reason))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2521
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2522 if force:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2523 remove, forget = modified + deleted + clean, added
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2524 elif after:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2525 remove, forget = deleted, []
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2526 warn(modified + added + clean, _('still exists'))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2527 else:
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2528 remove, forget = deleted + clean, []
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2529 warn(modified, _('is modified'))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2530 warn(added, _('has been marked for add'))
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2531
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	2532 for f in sorted(remove + forget):
6761 cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2533 if ui.verbose or not m.exact(f):
cb981fc955fb remove: work directly off status Matt Mackall <mpm@selenic.com> parents: 6760 diff changeset	2534 ui.status(_('removing %s\n') % m.rel(f))
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2535
2309 b2f37c7026ca remove: rewrite to be ~400x faster, bit more friendly Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2301 diff changeset	2536 repo.forget(forget)
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	2537 repo.remove(remove, unlink=not after)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2538
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2539 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	2540 """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	2541
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2542 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	2543 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	2544 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	2545
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2546 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	2547 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	2548 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	2549
7807 bd8f44638847 help: miscellaneous language fixes timeless <timeless@gmail.com> parents: 7765 diff changeset	2550 This command takes effect at the next commit. To undo a rename
3829 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3822 diff changeset	2551 before that, see hg revert.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2552 """
4914 9a2a73ea6135 repo locks: use True/False Matt Mackall <mpm@selenic.com> parents: 4906 diff changeset	2553 wlock = repo.wlock(False)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2554 try:
5610 2493a478f395 copy: handle rename internally Matt Mackall <mpm@selenic.com> parents: 5589 diff changeset	2555 return cmdutil.copy(ui, repo, pats, opts, rename=True)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2556 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	2557 wlock.release()
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2558
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2559 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	2560 """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	2561
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2562 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	2563 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	2564 ``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	2565 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	2566 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	2567 ``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	2568
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2569 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	2570
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2571 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	2572 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	2573 (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	2574 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	2575 ``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	2576 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	2577 ``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	2578 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	2579 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	2580 (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	2581
b1339234080e resolve: rewrite help to be clearer and more complete (issue2030). Greg Ward <greg-hg@gerg.ca> parents: 10541 diff changeset	2582 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	2583 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	2584 after a conflicting merge.
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2585 """
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2586
9646 5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2587 all, mark, unmark, show, nostatus = \
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2588 [opts.get(o) for o in 'all mark unmark list no_status'.split()]
7527 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2589
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2590 if (show and (mark or unmark)) or (mark and unmark):
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2591 raise util.Abort(_("too many options specified"))
7527 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2592 if pats and all:
5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2593 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	2594 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	2595 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	2596 'use --all to remerge all files'))
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2597
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2598 ms = merge_.mergestate(repo)
6594 fca1688f0459 resolve: use cmdutil.match Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	2599 m = cmdutil.match(repo, pats, opts)
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2600
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2601 for f in ms:
6594 fca1688f0459 resolve: use cmdutil.match Matt Mackall <mpm@selenic.com> parents: 6586 diff changeset	2602 if m(f):
7527 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2603 if show:
9646 5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2604 if nostatus:
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2605 ui.write("%s\n" % f)
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2606 else:
5b001f534452 commands: adding --no-status to resolve to match status timeless <timeless@gmail.com> parents: 9645 diff changeset	2607 ui.write("%s %s\n" % (ms[f].upper(), f))
7527 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2608 elif mark:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2609 ms.mark(f, "r")
7527 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	2610 elif unmark:
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2611 ms.mark(f, "u")
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2612 else:
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	2613 wctx = repo[None]
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2614 mctx = wctx.parents()[-1]
7847 30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2615
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2616 # backup pre-resolve (merge uses .orig for its own purposes)
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2617 a = repo.wjoin(f)
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2618 util.copyfile(a, a + ".resolve")
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2619
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2620 # resolve file
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2621 ms.resolve(f, wctx, mctx)
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	2622
7847 30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2623 # replace filemerge's .orig file with our resolve file
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2624 util.rename(a + ".resolve", a + ".orig")
30cb79d84352 resolve: keep .orig files Matt Mackall <mpm@selenic.com> parents: 7829 diff changeset	2625
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	2626 def revert(ui, repo, pats, *opts):
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 8021 diff changeset	2627 """restore individual files or directories to an earlier state
5574 d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5573 diff changeset	2628
8287 824ed0e35480 commands: fix capitalization in revert help text Martin Geisler <mg@lazybytes.net> parents: 8284 diff changeset	2629 (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: 8284 diff changeset	2630 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	2631
2212 8164e3f31638 revert: require explicit revision when working dir has two parents. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2204 diff changeset	2632 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	2633 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	2634 This restores the contents of the affected files to an unmodified
3829 531c116b2028 Add doc notes about revert and hg status vs diff Matt Mackall <mpm@selenic.com> parents: 3822 diff changeset	2635 state and unschedules adds, removes, copies, and renames. If the
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2636 working directory has two parents, you must explicitly specify a
a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2637 revision.
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2638
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2639 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	2640 to their contents as of a specific revision. This can be helpful
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2641 to "roll back" some or all of an earlier change. See 'hg help
aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	2642 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	2643
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	2644 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: 6442 diff changeset	2645 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	2646 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	2647 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	2648 afterwards.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2649
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	2650 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	2651 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	2652
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	2653 If names are given, all files matching the names are reverted.
2982 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	2654 If no arguments are given, no files are reverted.
5574 d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5573 diff changeset	2655
d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5573 diff changeset	2656 Modified files are saved with a .orig suffix before reverting.
d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5573 diff changeset	2657 To disable these backups, use --no-backup.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2658 """
2982 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	2659
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	2660 if opts["date"]:
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	2661 if opts["rev"]:
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	2662 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: 3813 diff changeset	2663 opts["rev"] = cmdutil.finddate(ui, repo, opts["date"])
120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	2664
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2665 if not pats and not opts.get('all'):
3020 ea2a9c13afc6 Add a hint for revert --all when aborting Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3016 diff changeset	2666 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: 3016 diff changeset	2667 'use --all to revert the whole repo'))
2982 890e285c52a1 revert: require --all to revert all files. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2963 diff changeset	2668
2212 8164e3f31638 revert: require explicit revision when working dir has two parents. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2204 diff changeset	2669 parent, p2 = repo.dirstate.parents()
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2670 if not opts.get('rev') and p2 != nullid:
3132 81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3095 diff changeset	2671 raise util.Abort(_('uncommitted merge - please provide a '
81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3095 diff changeset	2672 'specific revision'))
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2673 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	2674 node = ctx.node()
356e20d46b34 commands.py: use contexts in various places (debugstate, revert) Benoit Boissinot <benoit.boissinot@ens-lyon.org>* parents: 3951 diff changeset	2675 mf = ctx.manifest()
2407 8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	2676 if node == parent:
8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	2677 pmf = mf
8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	2678 else:
8fe3d60b7f19 revert: better fix for not printing 'reverting' message Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2406 diff changeset	2679 pmf = None
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2680
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2681 # 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	2682 # 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	2683 # but not other.
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2684
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2685 names = {}
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2686
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2687 wlock = repo.wlock()
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2688 try:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2689 # walk dirstate.
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2690
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2691 m = cmdutil.match(repo, pats, opts)
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2692 m.bad = lambda x, y: False
6586 d3463007d368 walk: return a single value Matt Mackall <mpm@selenic.com> parents: 6585 diff changeset	2693 for abs in repo.walk(m):
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	2694 names[abs] = m.rel(abs), m.exact(abs)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2695
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2696 # walk target manifest.
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2697
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2698 def badfn(path, msg):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2699 if path in names:
8679 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	2700 return
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2701 path_ = path + '/'
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2702 for f in names:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2703 if f.startswith(path_):
8679 32537b12e091 add: use match.bad callback more effectively Matt Mackall <mpm@selenic.com> parents: 8669 diff changeset	2704 return
8615 94ca38e63576 use ui instead of repo.ui when the former is in scope Martin Geisler <mg@lazybytes.net> parents: 8544 diff changeset	2705 ui.warn("%s: %s\n" % (m.rel(path), msg))
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2706
6579 0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2707 m = cmdutil.match(repo, pats, opts)
0159b7a36184 walk: pass match object to cmdutil.walk Matt Mackall <mpm@selenic.com> parents: 6578 diff changeset	2708 m.bad = badfn
6764 8db64464d136 context: add walk method Matt Mackall <mpm@selenic.com> parents: 6762 diff changeset	2709 for abs in repo[node].walk(m):
6584 29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	2710 if abs not in names:
29c77e5dfb3c walk: remove rel and exact returns Matt Mackall <mpm@selenic.com> parents: 6583 diff changeset	2711 names[abs] = m.rel(abs), m.exact(abs)
6031 7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6030 diff changeset	2712
6599 cd4db3999ef9 status: use match helpers for various users Matt Mackall <mpm@selenic.com> parents: 6594 diff changeset	2713 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	2714 changes = repo.status(match=m)[:4]
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	2715 modified, added, removed, deleted = map(set, changes)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2716
5266 d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2717 # if f is a rename, also revert the source
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2718 cwd = repo.getcwd()
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2719 for f in added:
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2720 src = repo.dirstate.copied(f)
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2721 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	2722 removed.add(src)
5266 d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2723 names[src] = (repo.pathto(src, cwd), True)
d59ed18ec2d0 Merge with crew-stable Brendan Cully <brendan@kublai.com> parents: 5259 5230 diff changeset	2724
6109 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2725 def removeforget(abs):
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2726 if repo.dirstate[abs] == 'a':
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2727 return _('forgetting %s\n')
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2728 return _('removing %s\n')
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2729
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2730 revert = ([], _('reverting %s\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2731 add = ([], _('adding %s\n'))
6109 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2732 remove = ([], removeforget)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2733 undelete = ([], _('undeleting %s\n'))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2734
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2735 disptable = (
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2736 # dispatch table:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2737 # file state
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2738 # action if in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2739 # action if not in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2740 # make backup if in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2741 # make backup if not in target manifest
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2742 (modified, revert, remove, True, True),
6109 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2743 (added, revert, remove, True, False),
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2744 (removed, undelete, None, False, False),
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2745 (deleted, revert, remove, False, False),
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2746 )
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2747
8209 a1a5a57efe90 replace util.sort with sorted built-in Matt Mackall <mpm@selenic.com> parents: 8190 diff changeset	2748 for abs, (rel, exact) in sorted(names.items()):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2749 mfentry = mf.get(abs)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2750 target = repo.wjoin(abs)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2751 def handle(xlist, dobackup):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2752 xlist[0].append(abs)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	2753 if dobackup and not opts.get('no_backup') and util.lexists(target):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2754 bakname = "%s.orig" % rel
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2755 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: 4914 diff changeset	2756 (rel, bakname))
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2757 if not opts.get('dry_run'):
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2758 util.copyfile(target, bakname)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2759 if ui.verbose or not exact:
6109 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2760 msg = xlist[1]
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2761 if not isinstance(msg, basestring):
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2762 msg = msg(abs)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2763 ui.status(msg % rel)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2764 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	2765 if abs not in table:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2766 continue
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2767 # file has changed in dirstate
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2768 if mfentry:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2769 handle(hitlist, backuphit)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2770 elif misslist is not None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2771 handle(misslist, backupmiss)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2772 break
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2773 else:
6031 7383384793fb revert: don't assume ignored files will be returned in the unknown list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6030 diff changeset	2774 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: 6030 diff changeset	2775 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: 6030 diff changeset	2776 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: 6030 diff changeset	2777 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: 6030 diff changeset	2778 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: 6030 diff changeset	2779 continue
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2780 # file has not changed in dirstate
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2781 if node == parent:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2782 if exact:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2783 ui.warn(_('no changes needed to %s\n') % rel)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2784 continue
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2785 if pmf is None:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2786 # only need parent manifest in this unlikely case,
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2787 # so do not read by default
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	2788 pmf = repo[parent].manifest()
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2789 if abs in pmf:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2790 if mfentry:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2791 # 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: 4914 diff changeset	2792 # manifests, do nothing
6030 d0dbae32517c revert: revert clean files when only a change of flags is needed Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5986 diff changeset	2793 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: 5986 diff changeset	2794 pmf.flags(abs) != mf.flags(abs)):
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2795 handle(revert, False)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2796 else:
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2797 handle(remove, False)
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2798
97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2799 if not opts.get('dry_run'):
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2800 def checkout(f):
41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2801 fc = ctx[f]
6743 86e8187b721a simplify flag handling Matt Mackall <mpm@selenic.com> parents: 6740 diff changeset	2802 repo.wwrite(f, fc.data(), fc.flags())
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2803
6109 242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2804 audit_path = util.path_auditor(repo.root)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2805 for f in remove[0]:
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2806 if repo.dirstate[f] == 'a':
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2807 repo.dirstate.forget(f)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2808 continue
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2809 audit_path(f)
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2810 try:
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2811 util.unlink(repo.wjoin(f))
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2812 except OSError:
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2813 pass
242595e612ed revert: unify forget and remove lists Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6108 diff changeset	2814 repo.dirstate.remove(f)
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2815
6299 653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	2816 normal = None
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	2817 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	2818 # 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	2819 # 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	2820 # 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	2821 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	2822 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	2823 else:
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	2824 normal = repo.dirstate.normal
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2825 for f in revert[0]:
41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2826 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	2827 if normal:
653ddd1d7cd7 revert: update state of files in the "checkout" list Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6296 diff changeset	2828 normal(f)
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2829
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2830 for f in add[0]:
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2831 checkout(f)
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2832 repo.dirstate.add(f)
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2833
6108 5086576a2152 revert: only call dirstate.normal when we know the file is clean Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6107 diff changeset	2834 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: 6107 diff changeset	2835 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: 6107 diff changeset	2836 normal = repo.dirstate.normal
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2837 for f in undelete[0]:
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2838 checkout(f)
6108 5086576a2152 revert: only call dirstate.normal when we know the file is clean Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6107 diff changeset	2839 normal(f)
6107 41bb88cb913e commands.revert: don't call hg.revert Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6106 diff changeset	2840
4915 97b734fb9c6f Use try/finally pattern to cleanup locks and transactions Matt Mackall <mpm@selenic.com> parents: 4914 diff changeset	2841 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	2842 wlock.release()
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	2843
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2844 def rollback(ui, repo):
5575 8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5574 diff changeset	2845 """roll back the last transaction
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5574 diff changeset	2846
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5574 diff changeset	2847 This command should be used with care. There is only one level of
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5574 diff changeset	2848 rollback, and there is no way to undo a rollback. It will also
8788ff630c26 imported patch rollback-help Matt Mackall <mpm@selenic.com> parents: 5574 diff changeset	2849 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	2850 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	2851 the working directory.
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2852
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2853 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	2854 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	2855 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	2856 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	2857
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	2858 - commit
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	2859 - import
af873901b575 commands, dates: use real lists instead of literal blocks Martin Geisler <mg@lazybytes.net> parents: 9892 diff changeset	2860 - pull
10376 a2950e053614 help: Improved body text timeless <timeless@mozdev.org> parents: 10375 diff changeset	2861 - 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	2862 - unbundle
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2863
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2864 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	2865 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	2866 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	2867 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	2868 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	2869 may fail if a rollback is performed.
4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2870 """
2362 482d3fb47d80 Renamed localrepo.undo() to rollback() and talk about "rollback information". Thomas Arendsen Hein <thomas@intevation.de> parents: 2356 diff changeset	2871 repo.rollback()
2227 4f072bb06e89 deprecate undo command, replace with rollback command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2212 diff changeset	2872
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	2873 def root(ui, repo):
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 8021 diff changeset	2874 """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	2875
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2876 Print the root directory of the current repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2877 """
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	2878 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	2879
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2880 def serve(ui, repo, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2881 """export the repository via HTTP
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2882
11102 275198bc904a commands: explain that "hg serve" is mostly for ad-hoc sharing Martin Geisler <mg@lazybytes.net> parents: 11089 diff changeset	2883 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: 11089 diff changeset	2884 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: 11089 diff changeset	2885 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: 11089 diff changeset	2886 longer periods of time.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2887
11103 d29bd98ebff6 commands: explain that "hg serve" does not do authentication Martin Geisler <mg@lazybytes.net> parents: 11102 diff changeset	2888 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	2889 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	2890 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	2891 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	2892 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	2893
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2894 By default, the server logs accesses to stdout and errors to
8277 b9403042968a write options in "-r/--rev" style in help texts Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2895 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	2896 files.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2897 """
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2898
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2899 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	2900 if repo is None:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2901 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	2902 " (.hg not found)"))
2396 8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2392 diff changeset	2903 s = sshserver.sshserver(ui, repo)
8d44649df03b refactor ssh server. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2392 diff changeset	2904 s.serve_forever()
2363 fa4c11751367 Give a response to unknown SSH commands Matt Mackall <mpm@selenic.com> parents: 2362 diff changeset	2905
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	2906 baseui = repo and repo.baseui or ui
5835 bd34f0ac3cb0 adding "prefix" option to "hg serve" (command line and [web] section) Michele Cella <michele.cella@gmail.com> parents: 5811 diff changeset	2907 optlist = ("name templates style address port prefix ipv6"
8870 c3e4d3c1d48b serve: obey the --encoding option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8864 diff changeset	2908 " accesslog errorlog webdir_conf certificate encoding")
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2909 for o in optlist.split():
8870 c3e4d3c1d48b serve: obey the --encoding option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8864 diff changeset	2910 if opts.get(o, None):
8190 9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	2911 baseui.setconfig("web", o, str(opts[o]))
9b8ac5fb7760 ui: kill most users of parentui name and arg, replace with .copy() Matt Mackall <mpm@selenic.com> parents: 8189 diff changeset	2912 if (repo is not None) and (repo.ui != baseui):
4835 9858477ed74c serve: respect settings from .hg/hgrc Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4833 diff changeset	2913 repo.ui.setconfig("web", o, str(opts[o]))
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2914
2127 8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2125 diff changeset	2915 if repo is None and not ui.config("web", "webdir_conf"):
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2916 raise error.RepoError(_("There is no Mercurial repository here"
1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7633 diff changeset	2917 " (.hg not found)"))
2127 8a85dbbadddf Allow 'hg serve --webdir-conf foo' to be run outside a repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 2125 diff changeset	2918
8778 c5f36402daad use new style classes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8761 diff changeset	2919 class service(object):
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2920 def init(self):
4672 272c0a09b203 Handle CTRL+C in serve under Windows. Marcos Chaves <marcos.nospam@gmail.com> parents: 4659 diff changeset	2921 util.set_signal_handler()
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8287 diff changeset	2922 self.httpd = server.create_server(baseui, repo)
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2923
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2924 if not ui.verbose:
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	2925 return
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2926
5970 f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5953 diff changeset	2927 if self.httpd.prefix:
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5953 diff changeset	2928 prefix = self.httpd.prefix.strip('/') + '/'
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5953 diff changeset	2929 else:
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5953 diff changeset	2930 prefix = ''
f25070ecf334 hgweb: fixes to make hg serve prefix handling more robust Michele Cella <michele.cella@gmail.com> parents: 5953 diff changeset	2931
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	2932 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	2933 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	2934 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	2935
6419 7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	2936 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	2937 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	2938 bindaddr = '*'
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	2939 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	2940 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	2941
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	2942 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	2943 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	2944 fqaddr = '[%s]' % fqaddr
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	2945 ui.status(_('listening at http://%s%s/%s (bound to %s:%d)\n') %
7c36aee46bf5 hg serve: add clearer message when starting the server with --verbose Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6405 diff changeset	2946 (fqaddr, port, prefix, bindaddr, self.httpd.port))
4380 e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2947
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2948 def run(self):
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2949 self.httpd.serve_forever()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2950
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2951 service = service()
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2952
e89f9afc462b Refactor commands.serve to allow other commands to run as services. Bryan O'Sullivan <bos@serpentine.com> parents: 4376 diff changeset	2953 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	2954
731 91ca3afab8e8 Add name matching to status command. Bryan O'Sullivan <bos@serpentine.com> parents: 729 diff changeset	2955 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	2956 """show changed files in the working directory
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2957
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	2958 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: 6442 diff changeset	2959 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	2960 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	2961 -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	2962 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	2963 options -mardu are used.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2964
6201 305d4450036a Extend/correct acc40572da5b regarding -qA and ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 6200 diff changeset	2965 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	2966 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	2967
3822 28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2968 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: 3815 diff changeset	2969 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: 3815 diff changeset	2970 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: 3815 diff changeset	2971 to one merge parent.
28134d82db9b Add notes about diff/merge asymmetry to export, diff, and log Matt Mackall <mpm@selenic.com> parents: 3815 diff changeset	2972
3467 2b3b703b3a2b Add --rev option to status Brendan Cully <brendan@kublai.com> parents: 3465 diff changeset	2973 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	2974 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	2975 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	2976 the changed files of a revision from its first parent.
3467 2b3b703b3a2b Add --rev option to status Brendan Cully <brendan@kublai.com> parents: 3465 diff changeset	2977
9157 9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2978 The codes used to show the status of files are::
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2979
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2980 M = modified
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2981 A = added
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2982 R = removed
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2983 C = clean
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2984 ! = missing (deleted by non-hg command, but still tracked)
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2985 ? = not tracked
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2986 I = ignored
9261667e9b82 commands: use minirst parser when displaying help Martin Geisler <mg@lazybytes.net> parents: 9142 diff changeset	2987 = origin of the previous file listed as A (added)
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2988 """
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	2989
10014 54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	2990 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	2991 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	2992
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	2993 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	2994 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	2995 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	2996 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	2997 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	2998 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	2999 else:
54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3000 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	3001
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	3002 cwd = (pats and repo.getcwd()) or ''
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3003 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	3004 copy = {}
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3005 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	3006 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	3007 if opts.get('all'):
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3008 show += ui.quiet and (states[:4] + ['clean']) or states
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3009 if not show:
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3010 show = ui.quiet and states[:4] or states[:5]
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3011
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3012 stat = repo.status(node1, node2, cmdutil.match(repo, pats, opts),
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3013 'ignored' in show, 'clean' in show, 'unknown' in show)
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3014 changestates = zip(states, 'MAR!?IC', stat)
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3015
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3016 if (opts.get('all') or opts.get('copies')) and not opts.get('no_status'):
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	3017 ctxn = repo[nullid]
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	3018 ctx1 = repo[node1]
f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	3019 ctx2 = repo[node2]
6646 9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6642 diff changeset	3020 added = stat[1]
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6642 diff changeset	3021 if node2 is None:
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6642 diff changeset	3022 added = stat[0] + stat[1] # merged?
6740 b148e9099133 use repo.changectx(None) to get a workingctx Matt Mackall <mpm@selenic.com> parents: 6739 diff changeset	3023
7622 4dd7b28003d2 use dict.iteritems() rather than dict.items() Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7598 diff changeset	3024 for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].iteritems():
6646 9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6642 diff changeset	3025 if k in added:
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6642 diff changeset	3026 copy[k] = v
9eb274d773d9 copies: teach copies about dirstate.copies Matt Mackall <mpm@selenic.com> parents: 6642 diff changeset	3027 elif v in added:
6276 c93ca83a3354 status: find copies and renames beyond the working directory Matt Mackall <mpm@selenic.com> parents: 6262 diff changeset	3028 copy[v] = k
c93ca83a3354 status: find copies and renames beyond the working directory Matt Mackall <mpm@selenic.com> parents: 6262 diff changeset	3029
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3030 for state, char, files in changestates:
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3031 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	3032 format = "%s %%s%s" % (char, end)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3033 if opts.get('no_status'):
6605 bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3034 format = "%%s%s" % end
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3035
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3036 for f in files:
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3037 ui.write(format % repo.pathto(f, cwd))
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3038 if f in copy:
bf2bf986ff87 status: refactor status command Matt Mackall <mpm@selenic.com> parents: 6603 diff changeset	3039 ui.write(' %s%s' % (repo.pathto(copy[f], cwd), end))
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	3040
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3041 def summary(ui, repo, **opts):
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3042 """summarize working directory state
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3043
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3044 This generates a brief summary of the working directory state,
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3045 including parents, branch, commit status, and available updates.
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3046
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3047 With the --remote option, this will check the default paths for
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3048 incoming and outgoing changes. This can be time-consuming.
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3049 """
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3050
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3051 ctx = repo[None]
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3052 parents = ctx.parents()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3053 pnode = parents[0].node()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3054 tags = repo.tags()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3055
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3056 for p in parents:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3057 t = ' '.join([t for t in tags if tags[t] == p.node()])
9618 d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3058 if p.rev() == -1:
d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3059 if not len(repo):
d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3060 t += _(' (empty repository)')
d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3061 else:
d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3062 t += _(' (no revision checked out)')
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3063 ui.write(_('parent: %d:%s %s\n') % (p.rev(), str(p), t))
9618 d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3064 if p.description():
d75a309a24b1 summary: add empty repository and no revision checked out hints Matt Mackall <mpm@selenic.com> parents: 9617 diff changeset	3065 ui.status(' ' + p.description().splitlines()[0].strip() + '\n')
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3066
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3067 branch = ctx.branch()
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3068 bheads = repo.branchheads(branch)
9873 541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3069 m = _('branch: %s\n') % branch
541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3070 if branch != 'default':
541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3071 ui.write(m)
541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3072 else:
541218fbad2a summary: note non-default branches with -q Matt Mackall <mpm@selenic.com> parents: 9857 diff changeset	3073 ui.status(m)
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3074
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3075 st = list(repo.status(unknown=True))[:6]
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3076 ms = merge_.mergestate(repo)
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3077 st.append([f for f in ms if ms[f] == 'u'])
9619 c4a6ce16708a summary: restore briefer commit status Matt Mackall <mpm@selenic.com> parents: 9618 diff changeset	3078 labels = [_('%d modified'), _('%d added'), _('%d removed'),
c4a6ce16708a summary: restore briefer commit status Matt Mackall <mpm@selenic.com> parents: 9618 diff changeset	3079 _('%d deleted'), _('%d unknown'), _('%d ignored'),
c4a6ce16708a summary: restore briefer commit status Matt Mackall <mpm@selenic.com> parents: 9618 diff changeset	3080 _('%d unresolved')]
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3081 t = []
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3082 for s, l in zip(st, labels):
9607 8e0e0d854b60 commands: do not split a translated string Martin Geisler <mg@lazybytes.net> parents: 9603 diff changeset	3083 if s:
8e0e0d854b60 commands: do not split a translated string Martin Geisler <mg@lazybytes.net> parents: 9603 diff changeset	3084 t.append(l % len(s))
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3085
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3086 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	3087 cleanworkdir = False
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3088
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3089 if len(parents) > 1:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3090 t += _(' (merge)')
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3091 elif branch != parents[0].branch():
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3092 t += _(' (new branch)')
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3093 elif (not st[0] and not st[1] and not st[2]):
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3094 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	3095 cleanworkdir = True
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3096 elif pnode not in bheads:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3097 t += _(' (new branch head)')
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3098
10269 acf001ee5ef8 summary: L10N messages hide clean-ness of workdir from 'hg summary' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 10263 diff changeset	3099 if cleanworkdir:
9605 3194227a4158 summary: quieter with -q Matt Mackall <mpm@selenic.com> parents: 9604 diff changeset	3100 ui.status(_('commit: %s\n') % t.strip())
3194227a4158 summary: quieter with -q Matt Mackall <mpm@selenic.com> parents: 9604 diff changeset	3101 else:
3194227a4158 summary: quieter with -q Matt Mackall <mpm@selenic.com> parents: 9604 diff changeset	3102 ui.write(_('commit: %s\n') % t.strip())
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3103
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3104 # all ancestors of branch heads - all ancestors of parent = new csets
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3105 new = [0] * len(repo)
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3106 cl = repo.changelog
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3107 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	3108 new[a] = 1
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3109 for a in cl.ancestors(*[cl.rev(n) for n in bheads]):
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3110 new[a] = 1
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3111 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	3112 if a >= 0:
f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3113 new[a] = 0
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3114 for a in cl.ancestors(*[p.rev() for p in parents]):
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3115 new[a] = 0
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3116 new = sum(new)
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3117
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3118 if new == 0:
9605 3194227a4158 summary: quieter with -q Matt Mackall <mpm@selenic.com> parents: 9604 diff changeset	3119 ui.status(_('update: (current)\n'))
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3120 elif pnode not in bheads:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3121 ui.write(_('update: %d new changesets (update)\n') % new)
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3122 else:
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3123 ui.write(_('update: %d new changesets, %d branch heads (merge)\n') %
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3124 (new, len(bheads)))
220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3125
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3126 if opts.get('remote'):
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3127 t = []
10389 6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3128 source, branches = hg.parseurl(ui.expandpath('default'))
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3129 other = hg.repository(cmdutil.remoteui(repo, {}), source)
10389 6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3130 revs, checkout = hg.addbranchrevs(repo, other, branches, opts.get('rev'))
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3131 ui.debug('comparing with %s\n' % url.hidepassword(source))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3132 repo.ui.pushbuffer()
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3133 common, incoming, rheads = repo.findcommonincoming(other)
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3134 repo.ui.popbuffer()
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3135 if incoming:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3136 t.append(_('1 or more incoming'))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3137
10389 6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3138 dest, branches = hg.parseurl(ui.expandpath('default-push', 'default'))
6dc25b01e170 fix remaining hg.parseurl uses Sune Foldager <cryo@cyanite.org> parents: 10384 diff changeset	3139 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3140 other = hg.repository(cmdutil.remoteui(repo, {}), dest)
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3141 ui.debug('comparing with %s\n' % url.hidepassword(dest))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3142 repo.ui.pushbuffer()
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3143 o = repo.findoutgoing(other)
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3144 repo.ui.popbuffer()
10390 f163775e36e0 summary: various fixes, add a test Matt Mackall <mpm@selenic.com> parents: 10389 diff changeset	3145 o = repo.changelog.nodesbetween(o, None)[0]
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3146 if o:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3147 t.append(_('%d outgoing') % len(o))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3148
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3149 if t:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3150 ui.write(_('remote: %s\n') % (', '.join(t)))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3151 else:
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3152 ui.status(_('remote: (synced)\n'))
a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3153
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3154 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	3155 """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	3156
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3157 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	3158
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3159 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	3160 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	3161 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	3162
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3163 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	3164 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	3165
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3166 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	3167 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	3168 similarly to other project files and can be hand-edited if
6448 cd3d49ffc6f6 Consistently 1 space after full stops in command doc strings Christian Ebert <blacktrash@gmx.net> parents: 6442 diff changeset	3169 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	3170 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	3171
1f733c2f0165 Document log date ranges and mention 'hg help dates' for all commands (issue998) Thomas Arendsen Hein <thomas@intevation.de> parents: 6161 diff changeset	3172 See 'hg help dates' for a list of formats valid for -d/--date.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3173 """
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3174
6739 c9fbd6ec3489 context: avoid using None for working parent Matt Mackall <mpm@selenic.com> parents: 6723 diff changeset	3175 rev_ = "."
6321 55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3176 names = (name1,) + names
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	3177 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	3178 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	3179 for n in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3180 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	3181 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	3182 if opts.get('rev') and opts.get('remove'):
4213 3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4179 diff changeset	3183 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	3184 if opts.get('rev'):
1596 41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	3185 rev_ = opts['rev']
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3186 message = opts.get('message')
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3187 if opts.get('remove'):
23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3188 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	3189 for n in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3190 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	3191 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	3192 if repo.tagtype(n) != expectedtype:
8008 36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3193 if expectedtype == 'global':
36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3194 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	3195 else:
36924a4711e9 commands, i18n: avoid untranslated strings as message parameters Wagner Bruna <wbruna@yahoo.com> parents: 8007 diff changeset	3196 raise util.Abort(_('tag \'%s\' is not a local tag') % n)
4213 3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4179 diff changeset	3197 rev_ = nullid
3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4179 diff changeset	3198 if not message:
9183 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9128 diff changeset	3199 # we don't translate commit messages
d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9128 diff changeset	3200 message = 'Removed tag %s' % ', '.join(names)
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3201 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	3202 for n in names:
55ba3bc5b8fd tag: allow multiple tags to be added or removed John Coomes <john.coomes@sun.com> parents: 6304 diff changeset	3203 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	3204 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	3205 '(use -f to force)') % n)
3132 81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3095 diff changeset	3206 if not rev_ and repo.dirstate.parents()[1] != nullid:
81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3095 diff changeset	3207 raise util.Abort(_('uncommitted merge - please provide a '
81da3c45aabd Move defaultrev into changectx Brendan Cully <brendan@kublai.com> parents: 3095 diff changeset	3208 'specific revision'))
6747 f6c00b17387c use repo[changeid] to get a changectx Matt Mackall <mpm@selenic.com> parents: 6746 diff changeset	3209 r = repo[rev_].node()
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2966 diff changeset	3210
eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2966 diff changeset	3211 if not message:
9183 d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9128 diff changeset	3212 # we don't translate commit messages
d0225fa2f6c4 do not translate commit messages Martin Geisler <mg@lazybytes.net> parents: 9128 diff changeset	3213 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	3214 (', '.join(names), short(r)))
2967 eef469259745 tag: shorten hash in default commit message Matt Mackall <mpm@selenic.com> parents: 2966 diff changeset	3215
6243 437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3216 date = opts.get('date')
437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3217 if date:
437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3218 date = util.parsedate(date)
437eef39458d fix incorrect date when committing a tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6234 diff changeset	3219
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3220 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	3221
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	3222 def tags(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3223 """list repository tags
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3224
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3225 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	3226 switch is used, a third column "local" is printed for local tags.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3227 """
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	3228
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2963 diff changeset	3229 hexfunc = ui.debugflag and hex or short
5658 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3230 tagtype = ""
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3231
8210 344751cd8cb8 replace various uses of list.reverse() Matt Mackall <mpm@selenic.com> parents: 8209 diff changeset	3232 for t, n in reversed(repo.tagslist()):
5658 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3233 if ui.quiet:
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3234 ui.write("%s\n" % t)
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3235 continue
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3236
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	3237 try:
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4505 diff changeset	3238 hn = hexfunc(n)
5658 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3239 r = "%5d:%s" % (repo.changelog.rev(n), hn)
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7632 diff changeset	3240 except error.LookupError:
3930 01d98d68d697 Add revlog.LookupError exception, and use it instead of RevlogError. Brendan Cully <brendan@kublai.com> parents: 3920 diff changeset	3241 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	3242 else:
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	3243 spaces = " " * (30 - encoding.colwidth(t))
5658 ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3244 if ui.verbose:
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3245 if repo.tagtype(t) == 'local':
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3246 tagtype = " local"
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3247 else:
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3248 tagtype = ""
ae3089cefaab Add --verbose support to tags command. Osku Salerma <osku@iki.fi> parents: 5657 diff changeset	3249 ui.write("%s%s %s%s\n" % (t, spaces, r, tagtype))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	3250
1731 251729df9cc6 add -p option to tip. for issue 64. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1728 diff changeset	3251 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	3252 """show the tip revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3253
8779 708938509732 Improve English for help text of many core hg commands. timeless <timeless@gmail.com> parents: 8778 diff changeset	3254 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	3255 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	3256 recently changed head).
6364 b22b39059722 Make tip help more helpful Patrick Mezard <pmezard@gmail.com> parents: 6353 diff changeset	3257
6367 51984a2413f2 Remove unexpected "Alternately" word from tip help. Patrick Mezard <pmezard@gmail.com> parents: 6364 diff changeset	3258 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	3259 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	3260 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	3261 and cannot be renamed or assigned to a different changeset.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3262 """
10152 56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	3263 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	3264 displayer.show(repo[len(repo) - 1])
56284451a22c Added support for templatevar "footer" to cmdutil.py Robert Bachmann <rbachm@gmail.com> parents: 10111 diff changeset	3265 displayer.close()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	3266
4699 a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3267 def unbundle(ui, repo, fname1, fnames, *opts):
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3268 """apply one or more changegroup files
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3269
a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3270 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	3271 bundle command.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3272 """
4699 a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3273 fnames = (fname1,) + fnames
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3274
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	3275 lock = repo.lock()
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3276 try:
d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3277 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	3278 f = url.open(ui, fname)
6180 d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3279 gen = changegroup.readbundle(f, fname)
d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3280 modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
d98ef03893e6 commands: lock() the repo while unbundling (issue1004) Patrick Mezard <pmezard@gmail.com> parents: 6178 diff changeset	3281 finally:
8109 496ae1ea4698 switch lock releasing in the core from gc to explicit Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 8088 diff changeset	3282 lock.release()
4699 a6b62584d0b2 unbundle: accept multiple file arguments Giorgos Keramidas <keramida@ceid.upatras.gr> parents: 4697 diff changeset	3283
7131 23bd7383891c commands: optional options where possible Alexander Solovyov <piranha@piranha.org.ua> parents: 7126 diff changeset	3284 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	3285
8855 f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3286 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False):
4014 509342f95564 various doc fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4013 diff changeset	3287 """update working directory
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3288
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3289 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	3290 changeset.
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3291
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3292 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	3293 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	3294 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	3295
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3296 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	3297 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	3298
9831 9ebad1b93456 help: improve wording of update help text Stuart W Marks <smarks@smarks.org> parents: 9806 diff changeset	3299 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	3300 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	3301 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	3302 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	3303 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	3304 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	3305 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	3306 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	3307
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3308 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	3309 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	3310
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3311 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	3312 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	3313
fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3314 Use null as the changeset to remove the working directory (like 'hg
8004 d5b1b846f277 commands: word-wrap help texts at 70 characters Martin Geisler <mg@daimi.au.dk> parents: 7983 diff changeset	3315 clone -U').
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6369 diff changeset	3316
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3317 If you want to update just one file to an older changeset, use 'hg revert'.
6842 e37fa751182a add note about updating one file to update help Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6814 diff changeset	3318
8033 aeb4a5c7a28e commands: consistently write switches as -a/--abc Martin Geisler <mg@lazybytes.net> parents: 8032 diff changeset	3319 See 'hg help dates' for a list of formats valid for -d/--date.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3320 """
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3321 if rev and node:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3322 raise util.Abort(_("please specify just one revision"))
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3323
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3324 if not rev:
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3325 rev = node
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3326
9450 e78967d3dd6f commands: forbid 'hg update --check --clean' Stuart W Marks <smarks@smarks.org> parents: 9429 diff changeset	3327 if check and clean:
9451 3e673c988c85 commands: expand -c and -C in update error message Martin Geisler <mg@lazybytes.net> parents: 9450 diff changeset	3328 raise util.Abort(_("cannot specify both -c/--check and -C/--clean"))
9450 e78967d3dd6f commands: forbid 'hg update --check --clean' Stuart W Marks <smarks@smarks.org> parents: 9429 diff changeset	3329
e78967d3dd6f commands: forbid 'hg update --check --clean' Stuart W Marks <smarks@smarks.org> parents: 9429 diff changeset	3330 if check:
8855 f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3331 # 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	3332 c = repo[None]
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3333 if c.modified() or c.added() or c.removed():
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3334 raise util.Abort(_("uncommitted local changes"))
f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3335
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	3336 if date:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3337 if rev:
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	3338 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: 4445 diff changeset	3339 rev = cmdutil.finddate(ui, repo, date)
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	3340
9187 7bb1dbfd3082 update: allow -c to jump branches if clean Matt Mackall <mpm@selenic.com> parents: 9128 diff changeset	3341 if clean or check:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3342 return hg.clean(repo, rev)
2808 30f59f4a327e Introduce update helper functions: update, merge, clean, and revert Matt Mackall <mpm@selenic.com> parents: 2806 diff changeset	3343 else:
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3344 return hg.update(repo, rev)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	3345
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	3346 def verify(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3347 """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	3348
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3349 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	3350
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3351 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	3352 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	3353 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	3354 integrity of their crosslinks and indices.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3355 """
2778 fdc232d8a193 Move repo.verify Matt Mackall <mpm@selenic.com> parents: 2776 diff changeset	3356 return hg.verify(repo)
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	3357
3651 6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3358 def version_(ui):
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3359 """output version and copyright information"""
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3360 ui.write(_("Mercurial Distributed SCM (version %s)\n")
7632 9626819b2e3d refactor version code Matt Mackall <mpm@selenic.com> parents: 7628 diff changeset	3361 % util.version())
3651 6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3362 ui.status(_(
10206 8b5ca9b9b435 commands: update copyright year to 2010 Martin Geisler <mg@lazybytes.net> parents: 9970 diff changeset	3363 "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
3651 6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3364 "This is free software; see the source for copying conditions. "
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3365 "There is NO\nwarranty; "
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3366 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3367 ))
6389205291c6 move show_version to version_ Matt Mackall <mpm@selenic.com> parents: 3650 diff changeset	3368
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	3369 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	3370
3187 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3371 globalopts = [
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3372 ('R', 'repository', '',
9477 a4f6e4427b65 mention overlay bundle file in global --repository option Adrian Buehlmann <adrian@cadifra.com> parents: 9467 diff changeset	3373 _('repository root directory or name of overlay bundle file')),
3187 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3374 ('', 'cwd', '', _('change working directory')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3375 ('y', 'noninteractive', None,
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3376 _('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: 3181 diff changeset	3377 ('q', 'quiet', None, _('suppress output')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3378 ('v', 'verbose', None, _('enable additional output')),
10541 fac67f0bfbb2 commands: clarify --config syntax Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10527 diff changeset	3379 ('', 'config', [],
fac67f0bfbb2 commands: clarify --config syntax Wagner Bruna <wbruna@softwareexpress.com.br> parents: 10527 diff changeset	3380 _('set/override config option (use \'section.name=value\')')),
3187 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3381 ('', 'debug', None, _('enable debugging output')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3382 ('', 'debugger', None, _('start debugger')),
7948 de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	3383 ('', 'encoding', encoding.encoding, _('set the charset encoding')),
de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	3384 ('', 'encodingmode', encoding.encodingmode,
de377b1a9a84 move encoding bits from util to encoding Matt Mackall <mpm@selenic.com> parents: 7942 diff changeset	3385 _('set the charset encoding mode')),
9698 3bbc6bc62809 commands: slightly better help for --traceback Martin Geisler <mg@lazybytes.net> parents: 9689 diff changeset	3386 ('', 'traceback', None, _('always print a traceback on exception')),
3187 fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3387 ('', '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: 3181 diff changeset	3388 ('', 'profile', None, _('print command execution profile')),
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3389 ('', '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: 3181 diff changeset	3390 ('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: 3181 diff changeset	3391 ]
fca5ddbaa12a factor opts: move globalopts to a more logical place Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3181 diff changeset	3392
3189 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3188 diff changeset	3393 dryrunopts = [('n', 'dry-run', None,
a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3188 diff changeset	3394 _('do not perform actions, just print output'))]
a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3188 diff changeset	3395
3190 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3396 remoteopts = [
37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3397 ('e', 'ssh', '', _('specify ssh command to use')),
37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3398 ('', 'remotecmd', '', _('specify hg command to run on the remote side')),
37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3399 ]
37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3400
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3401 walkopts = [
725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3402 ('I', 'include', [], _('include names matching the given patterns')),
725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3403 ('X', 'exclude', [], _('exclude names matching the given patterns')),
725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3404 ]
725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3405
3857 f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3406 commitopts = [
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3407 ('m', 'message', '', _('use <text> as commit message')),
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3408 ('l', 'logfile', '', _('read commit message from <file>')),
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3409 ]
f6f16f871049 Uniformisation of commit help for -m and -l. Mathieu Clabaut <mathieu.clabaut@gmail.com> parents: 3855 diff changeset	3410
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3411 commitopts2 = [
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3412 ('d', 'date', '', _('record datecode as commit date')),
8313 b695392491e7 commit: be more verbose in the -u help text Sverre Rabbelier <sverre@rabbelier.nl> parents: 8312 diff changeset	3413 ('u', 'user', '', _('record the specified user as committer')),
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3414 ]
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3415
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3416 templateopts = [
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3417 ('', 'style', '', _('display using template map file')),
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3418 ('', 'template', '', _('display with template')),
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3419 ]
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3420
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3421 logopts = [
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3422 ('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	3423 ('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	3424 ('l', 'limit', '', _('limit number of changes displayed')),
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3425 ('M', 'no-merges', None, _('do not show merges')),
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3426 ] + templateopts
cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3427
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3428 diffopts = [
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3429 ('a', 'text', None, _('treat all files as text')),
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3430 ('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	3431 ('', 'nodates', None, _('omit dates from diff headers'))
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3432 ]
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3433
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3434 diffopts2 = [
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3435 ('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	3436 ('', 'reverse', None, _('produce a diff that undoes the changes')),
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3437 ('w', 'ignore-all-space', None,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3438 _('ignore white space when comparing lines')),
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3439 ('b', 'ignore-space-change', None,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3440 _('ignore changes in the amount of white space')),
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3441 ('B', 'ignore-blank-lines', None,
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3442 _('ignore changes whose lines are all blank')),
9640 9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	3443 ('U', 'unified', '', _('number of lines of context to show')),
9e76232fbfbe diff: add --stat for diffstat output Brodie Rao <me+hg@dackz.net> parents: 9636 diff changeset	3444 ('', 'stat', None, _('output diffstat-style summary of changes')),
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3445 ]
034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3446
7402 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3447 similarityopts = [
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3448 ('s', 'similarity', '',
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3449 _('guess renamed files by similarity (0<=s<=100)'))
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3450 ]
bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3451
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3452 table = {
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3453 "^add": (add, walkopts + dryrunopts, _('[OPTION]... [FILE]...')),
2955 9d1c3529ebbc addremove: do not deprecate. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2639 diff changeset	3454 "addremove":
7402 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3455 (addremove, similarityopts + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3456 _('[OPTION]... [FILE]...')),
6182 07f2236c4dee add a blame alias for annotate Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6180 diff changeset	3457 "^annotate\|blame":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3458 (annotate,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3459 [('r', 'rev', '', _('annotate the specified revision')),
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	3460 ('', '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	3461 _('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	3462 ('', '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	3463 ('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	3464 ('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	3465 ('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	3466 ('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	3467 ('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	3468 ('c', 'changeset', None, _('list the changeset')),
4857 2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	3469 ('l', 'line-number', None,
2192001e4bb4 Add --line-number option to hg annotate (issue506) Thomas Arendsen Hein <thomas@intevation.de> parents: 4849 diff changeset	3470 _('show line number at the first appearance'))
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3471 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3472 _('[-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	3473 "archive":
2112 2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3474 (archive,
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3475 [('', 'no-decode', None, _('do not pass files through decoders')),
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3476 ('p', 'prefix', '', _('directory prefix for files in archive')),
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3477 ('r', 'rev', '', _('revision to distribute')),
2b03c6733efa add "archive" command, like "cvs export" only better. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2092 diff changeset	3478 ('t', 'type', '', _('type of distribution to create')),
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3479 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3480 _('[OPTION]... DEST')),
2159 5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	3481 "backout":
2158 ec96c4518236 add backout command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2153 diff changeset	3482 (backout,
2159 5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	3483 [('', 'merge', None,
5c34b98ad6b1 Small cleanups to backout command: Thomas Arendsen Hein <thomas@intevation.de> parents: 2158 diff changeset	3484 _('merge with old dirstate parent after backout')),
2614 8ba1c31f6864 backout: allow backout of merge changeset with --parent option. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2613 diff changeset	3485 ('', 'parent', '', _('parent to choose when backing out merge')),
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3486 ('r', 'rev', '', _('revision to backout')),
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3487 ] + walkopts + commitopts + commitopts2,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3488 _('[OPTION]... [-r] REV')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3489 "bisect":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3490 (bisect,
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3491 [('r', 'reset', False, _('reset bisect state')),
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3492 ('g', 'good', False, _('mark changeset good')),
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3493 ('b', 'bad', False, _('mark changeset bad')),
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3494 ('s', 'skip', False, _('skip testing changeset')),
7598 26adfaccdf73 lowercase help output Martin Geisler <mg@daimi.au.dk> parents: 7596 diff changeset	3495 ('c', 'command', '', _('use command to check changeset state')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3496 ('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	3497 _("[-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	3498 "branch":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3499 (branch,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3500 [('f', 'force', None,
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 7003 diff changeset	3501 _('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	3502 ('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	3503 _('[-fC] [NAME]')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3504 "branches":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3505 (branches,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3506 [('a', 'active', False,
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8958 diff changeset	3507 _('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	3508 ('c', 'closed', False,
9189 c2041f80f22a heads: more clarity for --closed Matt Mackall <mpm@selenic.com> parents: 9188 diff changeset	3509 _('show normal and closed branches'))],
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	3510 _('[-ac]')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3511 "bundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3512 (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	3513 [('f', 'force', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3514 _('run even when the destination is unrelated')),
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	3515 ('r', 'rev', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3516 _('a changeset intended to be added to the destination')),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3517 ('b', 'branch', [],
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3518 _('a specific branch you would like to bundle')),
3284 d89e98840b08 add -r/--rev and --base option to bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3278 diff changeset	3519 ('', 'base', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3520 _('a base changeset assumed to be available at the destination')),
6570 626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	3521 ('a', 'all', None, _('bundle all changesets in the repository')),
626cb86a6523 add compression type type parameter to bundle command Benoit Allard <benoit@aeteurope.nl> parents: 6518 diff changeset	3522 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3191 545b6d718593 add remoteopts to bundle command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3190 diff changeset	3523 ] + remoteopts,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	3524 _('[-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	3525 "cat":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3526 (cat,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3527 [('o', 'output', '', _('print output to file with formatted name')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3528 ('r', 'rev', '', _('print the given revision')),
6094 3998c1b0828f cat --decode: Drop short option, use opts.get() instead of opts[] Thomas Arendsen Hein <thomas@intevation.de> parents: 6093 diff changeset	3529 ('', 'decode', None, _('apply any matching decode filter')),
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3530 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3531 _('[OPTION]... FILE...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3532 "^clone":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3533 (clone,
6625 4d3a60d5c490 improve help text for clone -U Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6620 diff changeset	3534 [('U', 'noupdate', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3535 _('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	3536 ('u', 'updaterev', '',
2f1ab7f77ddc clone: add option -u/--updaterev Adrian Buehlmann <adrian@cadifra.com> parents: 9698 diff changeset	3537 _('revision, tag or branch to check out')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3538 ('r', 'rev', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3539 _('include the specified changeset')),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3540 ('b', 'branch', [],
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3541 _('clone only the specified branch')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3542 ('', '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	3543 ('', 'uncompressed', None,
de82749d3a71 clone: change name of --stream to --uncompressed. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2618 diff changeset	3544 _('use uncompressed transfer (fast over LAN)')),
3190 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3545 ] + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3546 _('[OPTION]... SOURCE [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3547 "^commit\|ci":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3548 (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	3549 [('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	3550 _('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	3551 ('', 'close-branch', None,
cce37dab7ad6 branch closing: mark closed branches with a 'close' extra John Mulligan <phlogistonjohn@asynchrono.us> parents: 7643 diff changeset	3552 _('mark a branch as closed, hiding it from the branch list')),
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3553 ] + walkopts + commitopts + commitopts2,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3554 _('[OPTION]... [FILE]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3555 "copy\|cp":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3556 (copy,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3557 [('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	3558 ('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	3559 _('forcibly copy over an existing managed file')),
3189 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3188 diff changeset	3560 ] + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3561 _('[OPTION]... [SOURCE]... DEST')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3562 "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')),
9604 fcc85abc762e commands: fix missing empty synopses Matt Mackall <mpm@selenic.com> parents: 9603 diff changeset	3563 "debugcheckstate": (debugcheckstate, [], ''),
7880 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7875 diff changeset	3564 "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	3565 "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	3566 (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	3567 [('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	3568 _('[-o] CMD')),
5781 45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3569 "debugdate":
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3570 (debugdate,
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3571 [('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	3572 _('[-e] DATE [RANGE]')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3573 "debugdata": (debugdata, [], _('FILE REV')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3574 "debugfsinfo": (debugfsinfo, [], _('[PATH]')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3575 "debugindex": (debugindex, [], _('FILE')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3576 "debugindexdot": (debugindexdot, [], _('FILE')),
9604 fcc85abc762e commands: fix missing empty synopses Matt Mackall <mpm@selenic.com> parents: 9603 diff changeset	3577 "debuginstall": (debuginstall, [], ''),
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	3578 "debugrebuildstate":
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	3579 (debugrebuildstate,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3580 [('r', 'rev', '', _('revision to rebuild to'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3581 _('[-r REV] [REV]')),
4730 eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3582 "debugrename":
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3583 (debugrename,
eadfaa9ec487 Updated command tables in commands.py and hgext extensions. Thomas Arendsen Hein <thomas@intevation.de> parents: 4726 diff changeset	3584 [('r', 'rev', '', _('revision to debug'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3585 _('[-r REV] FILE')),
5781 45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3586 "debugsetparents":
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3587 (debugsetparents, [], _('REV1 [REV2]')),
6296 a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	3588 "debugstate":
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	3589 (debugstate,
a9e6b8875805 debugstate: add --nodates Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6276 diff changeset	3590 [('', '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	3591 _('[OPTION]...')),
8812 859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	3592 "debugsub":
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	3593 (debugsub,
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	3594 [('r', 'rev', '', _('revision to check'))],
859f841937d0 subrepo: introduce basic state parsing Matt Mackall <mpm@selenic.com> parents: 8810 diff changeset	3595 _('[-r REV] [REV]')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3596 "debugwalk": (debugwalk, walkopts, _('[OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3597 "^diff":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3598 (diff,
7628 9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	3599 [('r', 'rev', [], _('revision')),
9c6ae2e09e11 diff: add --change option to display single changeset diff (issue1420) Stepan Koltsov <yozh@mx1.ru> parents: 7622 diff changeset	3600 ('c', 'change', '', _('change made by revision'))
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3601 ] + diffopts + diffopts2 + walkopts,
10520 75361931884d commands: mention diff -c timeless <timeless@mozdev.org> parents: 10515 diff changeset	3602 _('[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	3603 "^export":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3604 (export,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3605 [('o', 'output', '', _('print output to file with formatted name')),
10015 b5f352f33520 commands.export: accept -r option as revision specification Alexander Solovyov <piranha@piranha.org.ua> parents: 10014 diff changeset	3606 ('', 'switch-parent', None, _('diff against the second parent')),
b5f352f33520 commands.export: accept -r option as revision specification Alexander Solovyov <piranha@piranha.org.ua> parents: 10014 diff changeset	3607 ('r', 'rev', [], _('revisions to export')),
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 6658 diff changeset	3608 ] + diffopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3609 _('[OPTION]... [-o OUTFILESPEC] REV...')),
8902 b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	3610 "^forget":
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	3611 (forget,
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	3612 [] + walkopts,
b9a8b616521d Add a forget command for easily untracking files. Steve Losh <steve@stevelosh.com> parents: 8879 diff changeset	3613 _('[OPTION]... FILE...')),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	3614 "grep":
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	3615 (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	3616 [('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	3617 ('', 'all', None, _('print all revisions that match')),
2870 8eaaf1321bfe grep: add --follow support. Brendan Cully <brendan@kublai.com> parents: 2869 diff changeset	3618 ('f', 'follow', None,
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3619 _('follow changeset history,'
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3620 ' 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	3621 ('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	3622 ('l', 'files-with-matches', None,
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	3623 _('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	3624 ('n', 'line-number', None, _('print matching line numbers')),
11089 9f2c0dd91389 grep: clarify help for -r Brendan Cully <brendan@kublai.com> parents: 11067 diff changeset	3625 ('r', 'rev', [], _('only search files changed within revision range')),
6134 7b937b26adf7 Make annotae/grep print short dates with -q/--quiet. Thomas Arendsen Hein <thomas@intevation.de> parents: 6133 diff changeset	3626 ('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	3627 ('d', 'date', None, _('list the date (short with -q)')),
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3628 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3629 _('[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	3630 "heads":
65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	3631 (heads,
8031 813a02a4eda2 upper-case command line meta variables Martin Geisler <mg@lazybytes.net> parents: 8029 diff changeset	3632 [('r', 'rev', '', _('show only heads which are descendants of REV')),
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	3633 ('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	3634 ('a', 'active', False,
10326 8b90e2966219 commands: deprecate the heads -a option Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10316 diff changeset	3635 _('show active branchheads only [DEPRECATED]')),
8695 9a89253a32e6 heads: show closed heads only when --closed is passed John Mulligan <phlogistonjohn@asynchrono.us> parents: 8679 diff changeset	3636 ('c', 'closed', False,
9189 c2041f80f22a heads: more clarity for --closed Matt Mackall <mpm@selenic.com> parents: 9188 diff changeset	3637 _('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	3638 ] + templateopts,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	3639 _('[-ac] [-r STARTREV] [REV]...')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3640 "help": (help_, [], _('[TOPIC]')),
4665 091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	3641 "identify\|id":
091c9e54d306 identify: accept a revision argument Matt Mackall <mpm@selenic.com> parents: 4664 diff changeset	3642 (identify,
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	3643 [('r', 'rev', '', _('identify the specified revision')),
4666 48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	3644 ('n', 'num', None, _('show local revision number')),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	3645 ('i', 'id', None, _('show global revision id')),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	3646 ('b', 'branch', None, _('show branch')),
48c94bffdb28 identify: add support for output flags Matt Mackall <mpm@selenic.com> parents: 4665 diff changeset	3647 ('t', 'tags', None, _('show tags'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3648 _('[-nibt] [-r REV] [SOURCE]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3649 "import\|patch":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3650 (import_,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3651 [('p', 'strip', 1,
8038 2ee6769afe82 commands: removed bad linebreak in import help Martin Geisler <mg@lazybytes.net> parents: 8034 diff changeset	3652 _('directory strip option for patch. This has the same '
2125 3610d9468b1e Use string literal concatenation for optlist and import -p option Thomas Arendsen Hein <thomas@intevation.de> parents: 2124 diff changeset	3653 'meaning as the corresponding patch option')),
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	3654 ('b', 'base', '', _('base path')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3655 ('f', 'force', None,
4263 47ba52121433 Add import --exact. Brendan Cully <brendan@kublai.com> parents: 4256 diff changeset	3656 _('skip check for outstanding uncommitted changes')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3657 ('', 'no-commit', None,
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3658 _("don't commit, just update the working directory")),
4263 47ba52121433 Add import --exact. Brendan Cully <brendan@kublai.com> parents: 4256 diff changeset	3659 ('', '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	3660 _('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	3661 ('', 'import-branch', None,
8034 15725dbc900f commands: lower-case --import-branch help text Martin Geisler <mg@lazybytes.net> parents: 8033 diff changeset	3662 _('use any branch information in patch (implied by --exact)'))] +
7402 bffdab64dfbb import: add similarity option (issue295) Brendan Cully <brendan@kublai.com> parents: 7372 diff changeset	3663 commitopts + commitopts2 + similarityopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3664 _('[OPTION]... PATCH...')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3665 "incoming\|in":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3666 (incoming,
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3667 [('f', 'force', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3668 _('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	3669 ('n', 'newest-first', None, _('show newest record first')),
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	3670 ('', 'bundle', '', _('file to store the bundles into')),
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	3671 ('r', 'rev', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3672 _('a remote changeset intended to be added')),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3673 ('b', 'branch', [],
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3674 _('a specific branch you would like to pull')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3675 ] + logopts + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3676 _('[-p] [-n] [-M] [-f] [-r REV]...'
2544 0ab63318bc36 Added missing space in continued string. Thomas Arendsen Hein <thomas@intevation.de> parents: 2521 diff changeset	3677 ' [--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	3678 "^init":
3885 6081b4c68baf Corrected synopsis for many commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 3862 diff changeset	3679 (init,
6081b4c68baf Corrected synopsis for many commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 3862 diff changeset	3680 remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3681 _('[-e CMD] [--remotecmd CMD] [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3682 "locate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3683 (locate,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3684 [('r', 'rev', '', _('search the repository as it is in REV')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3685 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3686 _('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	3687 ('f', 'fullpath', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3688 _('print complete paths from the filesystem root')),
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3689 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3690 _('[OPTION]... [PATTERN]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3691 "^log\|history":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3692 (log,
3876 1e0b94cfba0e Remove deprecated old-style branch support Matt Mackall <mpm@selenic.com> parents: 3862 diff changeset	3693 [('f', 'follow', None,
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3694 _('follow changeset history,'
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3695 ' or file history across copies and renames')),
2784 12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2783 diff changeset	3696 ('', 'follow-first', None,
12a7bfcafd8f Add log option --follow-first to follow only the first parent of Brendan Cully <brendan@kublai.com> parents: 2783 diff changeset	3697 _('only follow the first parent of merge changesets')),
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	3698 ('d', 'date', '', _('show revisions matching date spec')),
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 3194 diff changeset	3699 ('C', 'copies', None, _('show copied files')),
4324 cd650cd61b06 help: log --keyword is case-insensitive TK Soh <teekaysoh@yahoo.com> parents: 4322 diff changeset	3700 ('k', 'keyword', [], _('do case-insensitive search for a keyword')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3701 ('r', 'rev', [], _('show the specified revision or range')),
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	3702 ('', '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	3703 ('m', 'only-merges', None, _('show only merges')),
8028 3aaca5901ade expand "rev" to "revision" in help texts Martin Geisler <mg@lazybytes.net> parents: 8027 diff changeset	3704 ('u', 'user', [], _('revisions committed by user')),
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 6048 diff changeset	3705 ('b', 'only-branch', [],
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 6048 diff changeset	3706 _('show only changesets within the given named branch')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3707 ('P', 'prune', [],
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3708 _('do not display revision or any of its ancestors')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3709 ] + logopts + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3710 _('[OPTION]... [FILE]')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3711 "manifest":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3712 (manifest,
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3713 [('r', 'rev', '', _('revision to display'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3714 _('[-r REV]')),
4014 509342f95564 various doc fixes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4013 diff changeset	3715 "^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	3716 (merge,
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3717 [('f', 'force', None, _('force a merge with outstanding changes')),
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3718 ('r', 'rev', '', _('revision to merge')),
8834 6d36fc70754e merge: rename -S/--show option to -P/--preview Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8815 diff changeset	3719 ('P', 'preview', None,
8387 50b6af595e0c merge: add -S/--show option to review revisions without merging Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8366 diff changeset	3720 _('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	3721 _('[-P] [-f] [[-r] REV]')),
5778 9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3722 "outgoing\|out":
9e97a7a0bb82 realign commands table Thomas Arendsen Hein <thomas@intevation.de> parents: 5776 diff changeset	3723 (outgoing,
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3724 [('f', 'force', None,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3725 _('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	3726 ('r', 'rev', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3727 _('a changeset intended to be included in the destination')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	3728 ('n', 'newest-first', None, _('show newest record first')),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3729 ('b', 'branch', [],
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3730 _('a specific branch you would like to push')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3731 ] + logopts + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3732 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
9606 69f8ac71ded1 Remove parents from default help in favor of summary Matt Mackall <mpm@selenic.com> parents: 9605 diff changeset	3733 "parents":
1724 5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	3734 (parents,
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3735 [('r', 'rev', '', _('show parents of the specified revision')),
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3736 ] + templateopts,
8544 48dd8a93d6db commands: standardize parents command meta data Ori Avtalion <ori@avtalion.name> parents: 8540 diff changeset	3737 _('[-r REV] [FILE]')),
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3738 "paths": (paths, [], _('[NAME]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3739 "^pull":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3740 (pull,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3741 [('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	3742 _('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	3743 ('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	3744 _('run even when remote repository is unrelated')),
3885 6081b4c68baf Corrected synopsis for many commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 3862 diff changeset	3745 ('r', 'rev', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3746 _('a remote changeset intended to be added')),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3747 ('b', 'branch', [],
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3748 _('a specific branch you would like to pull')),
3190 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3749 ] + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3750 _('[-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	3751 "^push":
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	3752 (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	3753 [('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	3754 ('r', 'rev', [],
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3755 _('a changeset intended to be included in the destination')),
10379 a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3756 ('b', 'branch', [],
a78bfaf988e1 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push Sune Foldager <cryo@cyanite.org> parents: 10376 diff changeset	3757 _('a specific branch you would like to push')),
3190 37b53487c341 factor opts: remote repo access options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3189 diff changeset	3758 ] + remoteopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3759 _('[-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	3760 "recover": (recover, []),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3761 "^remove\|rm":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3762 (remove,
6346 8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	3763 [('A', 'after', None, _('record delete for missing files')),
8e3b651382f5 improved semantics for remove (issue438) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	3764 ('f', 'force', None,
6347 3b42f7ac6916 tiny tab cleanup Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6346 diff changeset	3765 _('remove (and delete) file even if added or modified')),
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3766 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3767 _('[OPTION]... FILE...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3768 "rename\|mv":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3769 (rename,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3770 [('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	3771 ('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	3772 _('forcibly copy over an existing managed file')),
3189 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3188 diff changeset	3773 ] + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3774 _('[OPTION]... SOURCE... DEST')),
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	3775 "resolve":
92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	3776 (resolve,
9747 85a3285860d3 hg help resolve grossly mischaracterizes the --all switch timeless@mozdev.org parents: 9740 diff changeset	3777 [('a', 'all', None, _('select all unresolved files')),
7527 5a14a8f3b909 resolve: require -a switch to resolve all files Matt Mackall <mpm@selenic.com> parents: 7449 diff changeset	3778 ('l', 'list', None, _('list state of files needing merge')),
6518 92ccccb55ba3 resolve: new command Matt Mackall <mpm@selenic.com> parents: 6509 diff changeset	3779 ('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	3780 ('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	3781 ('n', 'no-status', None, _('hide status prefix'))]
7765 da9acc68b1dd resolve: accepts walkopts (-I and -X) Simon Heimberg <simohe@besonet.ch> parents: 7763 diff changeset	3782 + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3783 _('[OPTION]... [FILE]...')),
5574 d4ec6d61b3ee imported patch rev-help Matt Mackall <mpm@selenic.com> parents: 5573 diff changeset	3784 "revert":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3785 (revert,
2983 3b7626b861f8 revert: add -a as alias for --all Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2982 diff changeset	3786 [('a', 'all', None, _('revert all changes when no arguments given')),
3814 120be84f33de Add --date support to update and revert Matt Mackall <mpm@selenic.com> parents: 3813 diff changeset	3787 ('d', 'date', '', _('tipmost revision matching date')),
10375 adf9505e8888 commands: Try to improve help options text for basic commands timeless@mozdev.org parents: 10369 diff changeset	3788 ('r', 'rev', '', _('revert to the specified revision')),
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3789 ('', 'no-backup', None, _('do not save backup copies of files')),
3189 a73a785ea8e1 factor opts: --dry-run option Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3188 diff changeset	3790 ] + walkopts + dryrunopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3791 _('[OPTION]... [-r REV] [NAME]...')),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3792 "rollback": (rollback, []),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3793 "root": (root, []),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3794 "^serve":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3795 (serve,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3796 [('A', 'accesslog', '', _('name of access log file to write to')),
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	3797 ('d', 'daemon', None, _('run server in background')),
1742 1e5bb6c929cd Added help string for --daemon-pipefds Thomas Arendsen Hein <thomas@intevation.de> parents: 1741 diff changeset	3798 ('', 'daemon-pipefds', '', _('used internally by daemon mode')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3799 ('E', 'errorlog', '', _('name of error log file to write to')),
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	3800 ('p', 'port', 0, _('port to listen on (default: 8000)')),
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3801 ('a', 'address', '',
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3802 _('address to listen on (default: all interfaces)')),
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3803 ('', 'prefix', '',
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10270 diff changeset	3804 _('prefix path to serve from (default: server root)')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3805 ('n', 'name', '',
8026 683d8ebcf434 expand "dir" to "directory" in help texts Martin Geisler <mg@lazybytes.net> parents: 8021 diff changeset	3806 _('name to show in web pages (default: working directory)')),
2124 27fd8b7a6c51 Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf. Alexander Schremmer <alex AT alexanderweb DOT de> parents: 2122 diff changeset	3807 ('', 'webdir-conf', '', _('name of the webdir config file'
8027 9c7ca86fc658 expand "repo" to "repository" in help texts Martin Geisler <mg@lazybytes.net> parents: 8026 diff changeset	3808 ' (serve more than one repository)')),
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	3809 ('', 'pid-file', '', _('name of file to write process ID to')),
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	3810 ('', 'stdio', None, _('for remote clients')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3811 ('t', 'templates', '', _('web templates to use')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3812 ('', 'style', '', _('template style to use')),
4860 f3802f9f1840 Add SSL support to hg serve, activated via --certificate option Brendan Cully <brendan@kublai.com> parents: 4857 diff changeset	3813 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4')),
f3802f9f1840 Add SSL support to hg serve, activated via --certificate option Brendan Cully <brendan@kublai.com> parents: 4857 diff changeset	3814 ('', 'certificate', '', _('SSL certificate file'))],
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3815 _('[OPTION]...')),
5781 45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3816 "showconfig\|debugconfig":
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3817 (showconfig,
45d034c79ece Sort commands table again and add some missing 'hg' in synopsises. Thomas Arendsen Hein <thomas@intevation.de> parents: 5778 diff changeset	3818 [('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	3819 _('[-u] [NAME]...')),
9603 220d39af2e57 Introduce summary command Matt Mackall <mpm@selenic.com> parents: 9584 diff changeset	3820 "^summary\|sum":
9620 a7ef354da662 summary: add --remote Matt Mackall <mpm@selenic.com> parents: 9619 diff changeset	3821 (summary,
9625 022b15b9ec8c summary: remove reference to -p Matt Mackall <mpm@selenic.com> parents: 9620 diff changeset	3822 [('', '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	3823 "^status\|st":
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	3824 (status,
2661 5c10b7ed3411 status: add -c (clean) and -A (all files) options Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2639 diff changeset	3825 [('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	3826 ('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	3827 ('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	3828 ('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	3829 ('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	3830 ('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	3831 ('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	3832 ('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	3833 ('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	3834 ('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	3835 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3836 _('end filenames with NUL, for use with xargs')),
3467 2b3b703b3a2b Add --rev option to status Brendan Cully <brendan@kublai.com> parents: 3465 diff changeset	3837 ('', 'rev', [], _('show difference from revision')),
10014 54cd28258ea7 status: add the --change option to display files changed in a revision Gilles Moris <gilles.moris@free.fr> parents: 9983 diff changeset	3838 ('', 'change', '', _('list the changed files of a revision')),
3188 725e3d3145d8 factor opts: walk options Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3187 diff changeset	3839 ] + walkopts,
7364 ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3840 _('[OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3841 "tag":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3842 (tag,
4267 8185a1ca8628 tags: require -f to replace an existing tag Matt Mackall <mpm@selenic.com> parents: 4247 diff changeset	3843 [('f', 'force', None, _('replace existing tag')),
8185a1ca8628 tags: require -f to replace an existing tag Matt Mackall <mpm@selenic.com> parents: 4247 diff changeset	3844 ('l', 'local', None, _('make the tag local')),
4213 3be4785f8994 tags: add --remove Matt Mackall <mpm@selenic.com> parents: 4179 diff changeset	3845 ('r', 'rev', '', _('revision to tag')),
5147 c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3846 ('', 'remove', None, _('remove a tag')),
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3847 # -l/--local is already there, commitopts cannot be used
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3848 ('m', 'message', '', _('use <text> as commit message')),
c80af96943aa refactor options from cmdtable Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5125 diff changeset	3849 ] + commitopts2,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	3850 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
9604 fcc85abc762e commands: fix missing empty synopses Matt Mackall <mpm@selenic.com> parents: 9603 diff changeset	3851 "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	3852 "tip":
8eaa8e06a364 Add option -b/--branch to hg tip (as done for hg parents). Thomas Arendsen Hein <thomas@intevation.de> parents: 1761 diff changeset	3853 (tip,
6192 cd65a67aff31 Introduce templateopts and logopts to reduce duplicate option definitions. Thomas Arendsen Hein <thomas@intevation.de> parents: 6191 diff changeset	3854 [('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	3855 ('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	3856 ] + templateopts,
9952 5b149c88d9e8 commands: add missing options in command line help timeless@mozdev.org parents: 9951 diff changeset	3857 _('[-p] [-g]')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3858 "unbundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3859 (unbundle,
1601 a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	3860 [('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	3861 _('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	3862 _('[-u] FILE...')),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	3863 "^update\|up\|checkout\|co":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3864 (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	3865 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
8855 f331de880cbb update: add --check option Matt Mackall <mpm@selenic.com> parents: 8849 diff changeset	3866 ('c', 'check', None, _('check for uncommitted changes')),
4450 8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3867 ('d', 'date', '', _('tipmost revision matching date')),
8fa54b9c6c5a accept -r REV in more places Daniel Holth <dholth@fastmail.fm> parents: 4445 diff changeset	3868 ('r', 'rev', '', _('revision'))],
9718 fe1b19bfe75b help: describe new cross-branch behavior in update help text, plus cleanups Stuart W Marks <smarks@smarks.org> parents: 9714 diff changeset	3869 _('[-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	3870 "verify": (verify, []),
ad7f736f3214 help: remove redundant 'hg <command>' from command synopses Matt Mackall <mpm@selenic.com> parents: 7361 diff changeset	3871 "version": (version_, []),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	3872 }
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3873
7880 7ca2be800804 add debugcommands command: an easy to parse command + option index Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 7875 diff changeset	3874 norepo = ("clone init version help debugcommands debugcomplete debugdata"
5741 8ee0de123989 add debugfsinfo to check fs capabilities Matt Mackall <mpm@selenic.com> parents: 5716 diff changeset	3875 " debugindex debugindexdot debugdate debuginstall debugfsinfo")
6189 81cbb5dfdec0 Make hg debugancestor accept -R by making it an optionalrepo command. Thomas Arendsen Hein <thomas@intevation.de> parents: 6188 diff changeset	3876 optionalrepo = ("identify paths serve showconfig debugancestor")

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/commands.py @ 11217:1b8aa9ffa7dc stable