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

annotate mercurial/commands.py @ 2072:74d3f5336b66

Implement revlogng. revlogng results in smaller indexes, can address larger data files, and supports flags and version numbers. By default the original revlog format is used. To use the new format, use the following .hgrc field: [revlog] # format choices are 0 (classic revlog format) and 1 revlogng format=1

author	mason@suse.com
date	Tue, 04 Apr 2006 16:38:43 -0400
parents	a514c7509fa9
children	345107e167a0

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 #
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	4 #
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	5 # This software may be used and distributed according to the terms
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	6 # of the GNU General Public License, incorporated herein by reference.
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	7
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	8 from demandload import demandload
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	9 from node import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1395 diff changeset	10 from i18n import gettext as _
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	11 demandload(globals(), "os re sys signal shutil imp urllib pdb")
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	12 demandload(globals(), "fancyopts ui hg util lock revlog templater bundlerepo")
fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	13 demandload(globals(), "fnmatch hgweb mdiff random signal tempfile time")
fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	14 demandload(globals(), "traceback errno socket version struct atexit sets bz2")
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	15 demandload(globals(), "changegroup")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	16
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	17 class UnknownCommand(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	18 """Exception raised if command is not in the command table."""
1518 ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	19 class AmbiguousCommand(Exception):
ac4ca6bf2383 Improved error message for ambiguous command shortcuts. Thomas Arendsen Hein <thomas@intevation.de> parents: 1517 diff changeset	20 """Exception raised if command shortcut matches more than one command."""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	21
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	22 def filterfiles(filters, files):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	23 l = [x for x in files if x in filters]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	24
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	25 for t in filters:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	26 if t and t[-1] != "/":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	27 t += "/"
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	28 l += [x for x in files if x.startswith(t)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	29 return l
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	30
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	31 def relpath(repo, args):
628 8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	32 cwd = repo.getcwd()
8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	33 if cwd:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	34 return [util.normpath(os.path.join(cwd, x)) for x in args]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	35 return args
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	36
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	37 def matchpats(repo, pats=[], opts={}, head=''):
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	38 cwd = repo.getcwd()
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	39 if not pats and cwd:
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	40 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	41 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	42 cwd = ''
1413 1c64c628d15f Do not use 'glob' expansion by default on OS != 'nt' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1405 diff changeset	43 return util.cmdmatcher(repo.root, cwd, pats or ['.'], opts.get('include'),
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	44 opts.get('exclude'), head)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	45
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	46 def makewalk(repo, pats, opts, node=None, head='', badmatch=None):
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	47 files, matchfn, anypats = matchpats(repo, pats, opts, head)
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	48 exact = dict(zip(files, files))
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	49 def walk():
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	50 for src, fn in repo.walk(node=node, files=files, match=matchfn,
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	51 badmatch=badmatch):
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	52 yield src, fn, util.pathto(repo.getcwd(), fn), fn in exact
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	53 return files, matchfn, walk()
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	54
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	55 def walk(repo, pats, opts, node=None, head='', badmatch=None):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	56 files, matchfn, results = makewalk(repo, pats, opts, node, head, badmatch)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	57 for r in results:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	58 yield r
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	59
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	60 def walkchangerevs(ui, repo, pats, opts):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	61 '''Iterate over files and the revs they changed in.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	62
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	63 Callers most commonly need to iterate backwards over the history
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	64 it is interested in. Doing so has awful (quadratic-looking)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	65 performance, so we use iterators in a "windowed" way.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	66
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	67 We walk a window of revisions in the desired order. Within the
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	68 window, we first walk forwards to gather data, then in the desired
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	69 order (usually backwards) to display it.
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	70
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	71 This function returns an (iterator, getchange, matchfn) tuple. The
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	72 getchange function returns the changelog entry for a numeric
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	73 revision. The iterator yields 3-tuples. They will be of one of
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	74 the following forms:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	75
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	76 "window", incrementing, lastrev: stepping through a window,
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	77 positive if walking forwards through revs, last rev in the
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	78 sequence iterated over - use to reset state for the current window
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	79
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	80 "add", rev, fns: out-of-order traversal of the given file names
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	81 fns, which changed during revision rev - use to gather data for
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	82 possible display
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	83
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	84 "iter", rev, None: in-order traversal of the revs earlier iterated
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	85 over with "add" - use to display data'''
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	86
1799 b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	87 def increasing_windows(start, end, windowsize=8, sizelimit=512):
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	88 if start < end:
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	89 while start < end:
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	90 yield start, min(windowsize, end-start)
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	91 start += windowsize
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	92 if windowsize < sizelimit:
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	93 windowsize *= 2
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	94 else:
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	95 while start > end:
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	96 yield start, min(windowsize, start-end-1)
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	97 start -= windowsize
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	98 if windowsize < sizelimit:
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	99 windowsize *= 2
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	100
b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	101
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	102 files, matchfn, anypats = matchpats(repo, pats, opts)
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	103
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	104 if repo.changelog.count() == 0:
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	105 return [], False, matchfn
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	106
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	107 revs = map(int, revrange(ui, repo, opts['rev'] or ['tip:0']))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	108 wanted = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	109 slowpath = anypats
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	110 fncache = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	111
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	112 chcache = {}
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	113 def getchange(rev):
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	114 ch = chcache.get(rev)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	115 if ch is None:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	116 chcache[rev] = ch = repo.changelog.read(repo.lookup(str(rev)))
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	117 return ch
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	118
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	119 if not slowpath and not files:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	120 # No files, no patterns. Display all revs.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	121 wanted = dict(zip(revs, revs))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	122 if not slowpath:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	123 # Only files, no patterns. Check the history of each file.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	124 def filerevgen(filelog):
1799 b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	125 for i, window in increasing_windows(filelog.count()-1, -1):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	126 revs = []
1800 414e81ae971f Removed now obsolete min/max check in walkchangerevs(). Thomas Arendsen Hein <thomas@intevation.de> parents: 1799 diff changeset	127 for j in xrange(i - window, i + 1):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	128 revs.append(filelog.linkrev(filelog.node(j)))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	129 revs.reverse()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	130 for rev in revs:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	131 yield rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	132
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	133 minrev, maxrev = min(revs), max(revs)
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	134 for file_ in files:
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	135 filelog = repo.file(file_)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	136 # A zero count may be a directory or deleted file, so
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	137 # try to find matching entries on the slow path.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	138 if filelog.count() == 0:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	139 slowpath = True
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	140 break
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	141 for rev in filerevgen(filelog):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	142 if rev <= maxrev:
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	143 if rev < minrev:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	144 break
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	145 fncache.setdefault(rev, [])
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	146 fncache[rev].append(file_)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	147 wanted[rev] = 1
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	148 if slowpath:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	149 # The slow path checks files modified in every changeset.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	150 def changerevgen():
1799 b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	151 for i, window in increasing_windows(repo.changelog.count()-1, -1):
1800 414e81ae971f Removed now obsolete min/max check in walkchangerevs(). Thomas Arendsen Hein <thomas@intevation.de> parents: 1799 diff changeset	152 for j in xrange(i - window, i + 1):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	153 yield j, getchange(j)[3]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	154
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	155 for rev, changefiles in changerevgen():
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	156 matches = filter(matchfn, changefiles)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	157 if matches:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	158 fncache[rev] = matches
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	159 wanted[rev] = 1
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	160
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	161 def iterate():
1799 b942f5cfd326 Replaced fixed window size for walkchangerevs with an increasing one. Window Thomas Arendsen Hein <thomas@intevation.de> parents: 1782 diff changeset	162 for i, window in increasing_windows(0, len(revs)):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	163 yield 'window', revs[0] < revs[-1], revs[-1]
1800 414e81ae971f Removed now obsolete min/max check in walkchangerevs(). Thomas Arendsen Hein <thomas@intevation.de> parents: 1799 diff changeset	164 nrevs = [rev for rev in revs[i:i+window]
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	165 if rev in wanted]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	166 srevs = list(nrevs)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	167 srevs.sort()
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	168 for rev in srevs:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	169 fns = fncache.get(rev) or filter(matchfn, getchange(rev)[3])
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	170 yield 'add', rev, fns
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	171 for rev in nrevs:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	172 yield 'iter', rev, None
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	173 return iterate(), getchange, matchfn
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	174
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	175 revrangesep = ':'
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	176
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	177 def revrange(ui, repo, revs, revlog=None):
1066 ea878688221e Shortened commands.revrange() a little bit, added docstring. Thomas Arendsen Hein <thomas@intevation.de> parents: 1065 diff changeset	178 """Yield revision as strings from a list of revision specifications."""
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	179 if revlog is None:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	180 revlog = repo.changelog
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	181 revcount = revlog.count()
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	182 def fix(val, defval):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	183 if not val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	184 return defval
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	185 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	186 num = int(val)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	187 if str(num) != val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	188 raise ValueError
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	189 if num < 0:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	190 num += revcount
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	191 if num < 0:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	192 num = 0
1257 fe7fbfdb066d Clamp negative rev numbers at zero. Bryan O'Sullivan <bos@serpentine.com> parents: 1255 diff changeset	193 elif num >= revcount:
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	194 raise ValueError
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	195 except ValueError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	196 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	197 num = repo.changelog.rev(repo.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	198 except KeyError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	199 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	200 num = revlog.rev(revlog.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	201 except KeyError:
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	202 raise util.Abort(_('invalid revision identifier %s'), val)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	203 return num
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	204 seen = {}
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	205 for spec in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	206 if spec.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	207 start, end = spec.split(revrangesep, 1)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	208 start = fix(start, 0)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	209 end = fix(end, revcount - 1)
1066 ea878688221e Shortened commands.revrange() a little bit, added docstring. Thomas Arendsen Hein <thomas@intevation.de> parents: 1065 diff changeset	210 step = start > end and -1 or 1
ea878688221e Shortened commands.revrange() a little bit, added docstring. Thomas Arendsen Hein <thomas@intevation.de> parents: 1065 diff changeset	211 for rev in xrange(start, end+step, step):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	212 if rev in seen:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	213 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	214 seen[rev] = 1
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	215 yield str(rev)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	216 else:
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	217 rev = fix(spec, None)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	218 if rev in seen:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	219 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	220 seen[rev] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	221 yield str(rev)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	222
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	223 def make_filename(repo, r, pat, node=None,
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	224 total=None, seqno=None, revwidth=None, pathname=None):
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	225 node_expander = {
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	226 'H': lambda: hex(node),
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	227 'R': lambda: str(r.rev(node)),
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	228 'h': lambda: short(node),
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	229 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	230 expander = {
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	231 '%': lambda: '%',
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	232 'b': lambda: os.path.basename(repo.root),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	233 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	234
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	235 try:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	236 if node:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	237 expander.update(node_expander)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	238 if node and revwidth is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	239 expander['r'] = lambda: str(r.rev(node)).zfill(revwidth)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	240 if total is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	241 expander['N'] = lambda: str(total)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	242 if seqno is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	243 expander['n'] = lambda: str(seqno)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	244 if total is not None and seqno is not None:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	245 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	246 if pathname is not None:
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	247 expander['s'] = lambda: os.path.basename(pathname)
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	248 expander['d'] = lambda: os.path.dirname(pathname) or '.'
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	249 expander['p'] = lambda: pathname
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	250
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	251 newname = []
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	252 patlen = len(pat)
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	253 i = 0
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	254 while i < patlen:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	255 c = pat[i]
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	256 if c == '%':
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	257 i += 1
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	258 c = pat[i]
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	259 c = expander[c]()
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	260 newname.append(c)
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	261 i += 1
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	262 return ''.join(newname)
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	263 except KeyError, inst:
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	264 raise util.Abort(_("invalid format spec '%%%s' in output file name"),
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	265 inst.args[0])
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	266
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	267 def make_file(repo, r, pat, node=None,
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	268 total=None, seqno=None, revwidth=None, mode='wb', pathname=None):
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	269 if not pat or pat == '-':
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	270 return 'w' in mode and sys.stdout or sys.stdin
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	271 if hasattr(pat, 'write') and 'w' in mode:
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	272 return pat
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	273 if hasattr(pat, 'read') and 'r' in mode:
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	274 return pat
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	275 return open(make_filename(repo, r, pat, node, total, seqno, revwidth,
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	276 pathname),
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	277 mode)
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	278
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	279 def write_bundle(cg, filename=None, compress=True):
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	280 """Write a bundle file and return its filename.
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	281
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	282 Existing files will not be overwritten.
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	283 If no filename is specified, a temporary file is created.
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	284 bz2 compression can be turned off.
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	285 The bundle file will be deleted in case of errors.
1972 ce127cb4ee6e Documented behaviour of write_bundle regarding file handles. Thomas Arendsen Hein <thomas@intevation.de> parents: 1971 diff changeset	286 """
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	287 class nocompress(object):
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	288 def compress(self, x):
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	289 return x
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	290 def flush(self):
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	291 return ""
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	292
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	293 fh = 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	294 cleanup = None
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	295 try:
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	296 if filename:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	297 if os.path.exists(filename):
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	298 raise util.Abort(_("file '%s' already exists"), filename)
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	299 fh = open(filename, "wb")
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	300 else:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	301 fd, filename = tempfile.mkstemp(suffix=".hg", prefix="hg-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	302 fh = os.fdopen(fd, "wb")
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	303 cleanup = filename
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	304
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	305 if compress:
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	306 fh.write("HG10")
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	307 z = bz2.BZ2Compressor(9)
8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	308 else:
1980 dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	309 fh.write("HG10UN")
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	310 z = nocompress()
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	311 # parse the changegroup data, otherwise we will block
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	312 # in case of sshrepo because we don't know the end of the stream
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	313
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	314 # an empty chunkiter is the end of the changegroup
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	315 empty = False
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	316 while not empty:
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	317 empty = True
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	318 for chunk in changegroup.chunkiter(cg):
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	319 empty = False
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	320 fh.write(z.compress(changegroup.genchunk(chunk)))
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1980 diff changeset	321 fh.write(z.compress(changegroup.closechunk()))
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	322 fh.write(z.flush())
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	323 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	324 return filename
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	325 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	326 if fh is not 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	327 fh.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	328 if cleanup is not 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	329 os.unlink(cleanup)
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	330
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	331 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
1728 9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	332 changes=None, text=False, opts={}):
1804 c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	333 if not node1:
c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	334 node1 = repo.dirstate.parents()[0]
c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	335 # reading the data for node1 early allows it to play nicely
c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	336 # with repo.changes and the revlog cache.
c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	337 change = repo.changelog.read(node1)
c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	338 mmap = repo.manifest.read(change[0])
c3f959c1c3ff refactor the dodiff optimization Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1803 diff changeset	339 date1 = util.datestr(change[2])
1803 06e7447c7302 speed up hg log --patch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1801 diff changeset	340
904 969647d5100a Add optional parameter for changed/added/del/unknown files to commands.dodiff mason@suse.com parents: 899 diff changeset	341 if not changes:
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	342 changes = repo.changes(node1, node2, files, match=match)
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	343 modified, added, removed, deleted, unknown = changes
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	344 if files:
1626 f2b1df3dbcbb make the order of the arguments for filterfiles consistent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1625 diff changeset	345 modified, added, removed = map(lambda x: filterfiles(files, x),
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	346 (modified, added, removed))
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	347
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	348 if not modified and not added and not removed:
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	349 return
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	350
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	351 if node2:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	352 change = repo.changelog.read(node2)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	353 mmap2 = repo.manifest.read(change[0])
1321 b47f96a178a3 Clean up date and timezone handling. Bryan O'Sullivan <bos@serpentine.com> parents: 1320 diff changeset	354 date2 = util.datestr(change[2])
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	355 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	356 return repo.file(f).read(mmap2[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	357 else:
1320 5f277e73778f Fix up representation of dates in hgweb. Bryan O'Sullivan <bos@serpentine.com> parents: 1319 diff changeset	358 date2 = util.datestr()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	359 def read(f):
1648 80640ef93aec Process working files through encode filters in dodiff() Petr Mazanec <petr.mazanec@tiscali.cz> parents: 1637 diff changeset	360 return repo.wread(f)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	361
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	362 if ui.quiet:
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	363 r = None
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	364 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	365 hexfunc = ui.verbose and hex or short
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	366 r = [hexfunc(node) for node in [node1, node2] if node]
8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 395 diff changeset	367
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	368 diffopts = ui.diffopts()
1728 9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	369 showfunc = opts.get('show_function') or diffopts['showfunc']
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	370 ignorews = opts.get('ignore_all_space') or diffopts['ignorews']
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	371 for f in modified:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	372 to = None
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	373 if f in mmap:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	374 to = repo.file(f).read(mmap[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	375 tn = read(f)
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	376 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	377 showfunc=showfunc, ignorews=ignorews))
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	378 for f in added:
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	379 to = None
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	380 tn = read(f)
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	381 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	382 showfunc=showfunc, ignorews=ignorews))
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	383 for f in removed:
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	384 to = repo.file(f).read(mmap[f])
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	385 tn = None
1637 3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	386 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text,
3b1b44b917f4 Add new bdiff based unidiff generation. mason@suse.com parents: 1634 diff changeset	387 showfunc=showfunc, ignorews=ignorews))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	388
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	389 def trimuser(ui, name, rev, revcache):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	390 """trim the name of the user who committed a change"""
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	391 user = revcache.get(rev)
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	392 if user is None:
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	393 user = revcache[rev] = ui.shortuser(name)
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	394 return user
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	395
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	396 class changeset_templater(object):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	397 '''use templater module to format changeset information.'''
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	398
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	399 def __init__(self, ui, repo, mapfile):
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	400 self.t = templater.templater(mapfile, templater.common_filters,
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	401 cache={'parent': '{rev}:{node\|short} ',
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	402 'manifest': '{rev}:{node\|short}'})
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	403 self.ui = ui
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	404 self.repo = repo
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	405
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	406 def use_template(self, t):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	407 '''set template string to use'''
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	408 self.t.cache['changeset'] = t
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	409
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	410 def write(self, thing, header=False):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	411 '''write expanded template.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	412 uses in-order recursive traverse of iterators.'''
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	413 for t in thing:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	414 if hasattr(t, '__iter__'):
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	415 self.write(t, header=header)
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	416 elif header:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	417 self.ui.write_header(t)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	418 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	419 self.ui.write(t)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	420
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	421 def write_header(self, thing):
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	422 self.write(thing, header=True)
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	423
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	424 def show(self, rev=0, changenode=None, brinfo=None):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	425 '''show a single changeset or file revision'''
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	426 log = self.repo.changelog
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	427 if changenode is None:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	428 changenode = log.node(rev)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	429 elif not rev:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	430 rev = log.rev(changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	431
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	432 changes = log.read(changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	433
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	434 def showlist(name, values, plural=None, **args):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	435 '''expand set of values.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	436 name is name of key in template map.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	437 values is list of strings or dicts.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	438 plural is plural of name, if not simply name + 's'.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	439
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	440 expansion works like this, given name 'foo'.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	441
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	442 if values is empty, expand 'no_foos'.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	443
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	444 if 'foo' not in template map, return values as a string,
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	445 joined by space.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	446
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	447 expand 'start_foos'.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	448
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	449 for each value, expand 'foo'. if 'last_foo' in template
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	450 map, expand it instead of 'foo' for last key.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	451
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	452 expand 'end_foos'.
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	453 '''
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	454 if plural: names = plural
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	455 else: names = name + 's'
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	456 if not values:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	457 noname = 'no_' + names
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	458 if noname in self.t:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	459 yield self.t(noname, **args)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	460 return
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	461 if name not in self.t:
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	462 if isinstance(values[0], str):
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	463 yield ' '.join(values)
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	464 else:
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	465 for v in values:
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	466 yield dict(v, **args)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	467 return
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	468 startname = 'start_' + names
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	469 if startname in self.t:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	470 yield self.t(startname, **args)
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	471 vargs = args.copy()
1908 be71c04d62c0 print tags in compact template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1907 diff changeset	472 def one(v, tag=name):
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	473 try:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	474 vargs.update(v)
1937 3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	475 except (AttributeError, ValueError):
3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	476 try:
3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	477 for a, b in v:
3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	478 vargs[a] = b
3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	479 except ValueError:
3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	480 vargs[name] = v
1908 be71c04d62c0 print tags in compact template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1907 diff changeset	481 return self.t(tag, **vargs)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	482 lastname = 'last_' + name
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	483 if lastname in self.t:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	484 last = values.pop()
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	485 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	486 last = None
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	487 for v in values:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	488 yield one(v)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	489 if last is not None:
1908 be71c04d62c0 print tags in compact template. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1907 diff changeset	490 yield one(last, tag=lastname)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	491 endname = 'end_' + names
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	492 if endname in self.t:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	493 yield self.t(endname, **args)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	494
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	495 if brinfo:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	496 def showbranches(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	497 if changenode in brinfo:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	498 for x in showlist('branch', brinfo[changenode],
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	499 plural='branches', **args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	500 yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	501 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	502 showbranches = ''
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	503
1910 e2fe1953f417 changeset_templater: only compute manifest when --debug. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	504 if self.ui.debugflag:
e2fe1953f417 changeset_templater: only compute manifest when --debug. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	505 def showmanifest(**args):
e2fe1953f417 changeset_templater: only compute manifest when --debug. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	506 args = args.copy()
1937 3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	507 args.update(dict(rev=self.repo.manifest.rev(changes[0]),
3f6be77eda58 fix use of python 2.4 features. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1920 diff changeset	508 node=hex(changes[0])))
1910 e2fe1953f417 changeset_templater: only compute manifest when --debug. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	509 yield self.t('manifest', **args)
e2fe1953f417 changeset_templater: only compute manifest when --debug. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	510 else:
e2fe1953f417 changeset_templater: only compute manifest when --debug. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1909 diff changeset	511 showmanifest = ''
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	512
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	513 def showparents(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	514 parents = [[('rev', log.rev(p)), ('node', hex(p))]
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	515 for p in log.parents(changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	516 if self.ui.debugflag or p != nullid]
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	517 if (not self.ui.debugflag and len(parents) == 1 and
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	518 parents[0][0][1] == rev - 1):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	519 return
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	520 for x in showlist('parent', parents, **args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	521 yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	522
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	523 def showtags(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	524 for x in showlist('tag', self.repo.nodetags(changenode), **args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	525 yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	526
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	527 if self.ui.debugflag:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	528 files = self.repo.changes(log.parents(changenode)[0], changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	529 def showfiles(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	530 for x in showlist('file', files[0], **args): yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	531 def showadds(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	532 for x in showlist('file_add', files[1], **args): yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	533 def showdels(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	534 for x in showlist('file_del', files[2], **args): yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	535 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	536 def showfiles(**args):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	537 for x in showlist('file', changes[3], **args): yield x
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	538 showadds = ''
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	539 showdels = ''
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	540
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	541 props = {
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	542 'author': changes[1],
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	543 'branches': showbranches,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	544 'date': changes[2],
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	545 'desc': changes[4],
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	546 'file_adds': showadds,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	547 'file_dels': showdels,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	548 'files': showfiles,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	549 'manifest': showmanifest,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	550 'node': hex(changenode),
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	551 'parents': showparents,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	552 'rev': rev,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	553 'tags': showtags,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	554 }
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	555
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	556 try:
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	557 if self.ui.debugflag and 'header_debug' in self.t:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	558 key = 'header_debug'
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	559 elif self.ui.quiet and 'header_quiet' in self.t:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	560 key = 'header_quiet'
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	561 elif self.ui.verbose and 'header_verbose' in self.t:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	562 key = 'header_verbose'
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	563 elif 'header' in self.t:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	564 key = 'header'
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	565 else:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	566 key = ''
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	567 if key:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	568 self.write_header(self.t(key, **props))
1917 7f578969f3f6 add quiet and debug template keys. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1914 diff changeset	569 if self.ui.debugflag and 'changeset_debug' in self.t:
7f578969f3f6 add quiet and debug template keys. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1914 diff changeset	570 key = 'changeset_debug'
7f578969f3f6 add quiet and debug template keys. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1914 diff changeset	571 elif self.ui.quiet and 'changeset_quiet' in self.t:
7f578969f3f6 add quiet and debug template keys. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1914 diff changeset	572 key = 'changeset_quiet'
7f578969f3f6 add quiet and debug template keys. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1914 diff changeset	573 elif self.ui.verbose and 'changeset_verbose' in self.t:
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	574 key = 'changeset_verbose'
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	575 else:
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	576 key = 'changeset'
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	577 self.write(self.t(key, **props))
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	578 except KeyError, inst:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	579 raise util.Abort(_("%s: no key named '%s'") % (self.t.mapfile,
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	580 inst.args[0]))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	581 except SyntaxError, inst:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	582 raise util.Abort(_('%s: %s') % (self.t.mapfile, inst.args[0]))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	583
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	584 class changeset_printer(object):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	585 '''show changeset information when templating not requested.'''
37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	586
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	587 def __init__(self, ui, repo):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	588 self.ui = ui
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	589 self.repo = repo
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	590
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	591 def show(self, rev=0, changenode=None, brinfo=None):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	592 '''show a single changeset or file revision'''
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	593 log = self.repo.changelog
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	594 if changenode is None:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	595 changenode = log.node(rev)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	596 elif not rev:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	597 rev = log.rev(changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	598
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	599 if self.ui.quiet:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	600 self.ui.write("%d:%s\n" % (rev, short(changenode)))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	601 return
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	602
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	603 changes = log.read(changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	604 date = util.datestr(changes[2])
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	605
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	606 parents = [(log.rev(p), self.ui.verbose and hex(p) or short(p))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	607 for p in log.parents(changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	608 if self.ui.debugflag or p != nullid]
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	609 if (not self.ui.debugflag and len(parents) == 1 and
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	610 parents[0][0] == rev-1):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	611 parents = []
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	612
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	613 if self.ui.verbose:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	614 self.ui.write(_("changeset: %d:%s\n") % (rev, hex(changenode)))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	615 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	616 self.ui.write(_("changeset: %d:%s\n") % (rev, short(changenode)))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	617
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	618 for tag in self.repo.nodetags(changenode):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	619 self.ui.status(_("tag: %s\n") % tag)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	620 for parent in parents:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	621 self.ui.write(_("parent: %d:%s\n") % parent)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	622
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	623 if brinfo and changenode in brinfo:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	624 br = brinfo[changenode]
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	625 self.ui.write(_("branch: %s\n") % " ".join(br))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	626
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	627 self.ui.debug(_("manifest: %d:%s\n") %
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	628 (self.repo.manifest.rev(changes[0]), hex(changes[0])))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	629 self.ui.status(_("user: %s\n") % changes[1])
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	630 self.ui.status(_("date: %s\n") % date)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	631
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	632 if self.ui.debugflag:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	633 files = self.repo.changes(log.parents(changenode)[0], changenode)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	634 for key, value in zip([_("files:"), _("files+:"), _("files-:")],
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	635 files):
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	636 if value:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	637 self.ui.note("%-12s %s\n" % (key, " ".join(value)))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	638 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	639 self.ui.note(_("files: %s\n") % " ".join(changes[3]))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	640
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	641 description = changes[4].strip()
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	642 if description:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	643 if self.ui.verbose:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	644 self.ui.status(_("description:\n"))
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	645 self.ui.status(description)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	646 self.ui.status("\n\n")
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	647 else:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	648 self.ui.status(_("summary: %s\n") %
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	649 description.splitlines()[0])
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	650 self.ui.status("\n")
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	651
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	652 def show_changeset(ui, repo, opts):
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	653 '''show one changeset. uses template or regular display. caller
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	654 can pass in 'style' and 'template' options in opts.'''
1909 37b9f80a5fbb add doc comments to template code. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1908 diff changeset	655
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	656 tmpl = opts.get('template')
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	657 if tmpl:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	658 tmpl = templater.parsestring(tmpl, quoted=False)
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	659 else:
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	660 tmpl = ui.config('ui', 'logtemplate')
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	661 if tmpl: tmpl = templater.parsestring(tmpl)
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	662 mapfile = opts.get('style') or ui.config('ui', 'style')
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	663 if tmpl or mapfile:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	664 if mapfile:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	665 if not os.path.isfile(mapfile):
1914 a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	666 mapname = templater.templatepath('map-cmdline.' + mapfile)
a5bf0030df5f make --style=compact look for map-cmdline.compact. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1913 diff changeset	667 if not mapname: mapname = templater.templatepath(mapfile)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	668 if mapname: mapfile = mapname
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	669 try:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	670 t = changeset_templater(ui, repo, mapfile)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	671 except SyntaxError, inst:
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	672 raise util.Abort(inst.args[0])
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	673 if tmpl: t.use_template(tmpl)
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	674 return t
7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	675 return changeset_printer(ui, repo)
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	676
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	677 def show_version(ui):
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	678 """output version and copyright information"""
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	679 ui.write(_("Mercurial Distributed SCM (version %s)\n")
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	680 % version.get_version())
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	681 ui.status(_(
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	682 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	683 "This is free software; see the source for copying conditions. "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	684 "There is NO\nwarranty; "
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	685 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
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	686 ))
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	687
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	688 def help_(ui, cmd=None, with_version=False):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	689 """show help for a given command or all commands"""
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	690 option_lists = []
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	691 if cmd and cmd != 'shortlist':
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	692 if with_version:
160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	693 show_version(ui)
160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	694 ui.write('\n')
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	695 aliases, i = find(cmd)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	696 # synopsis
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	697 ui.write("%s\n\n" % i[2])
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	698
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	699 # description
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	700 doc = i[0].__doc__
1710 c65113f3627a Show "(No help text available)" for commands without doc string. Thomas Arendsen Hein <thomas@intevation.de> parents: 1661 diff changeset	701 if not doc:
c65113f3627a Show "(No help text available)" for commands without doc string. Thomas Arendsen Hein <thomas@intevation.de> parents: 1661 diff changeset	702 doc = _("(No help text available)")
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	703 if ui.quiet:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	704 doc = doc.splitlines(0)[0]
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	705 ui.write("%s\n" % doc.rstrip())
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	706
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	707 if not ui.quiet:
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	708 # aliases
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	709 if len(aliases) > 1:
b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	710 ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:]))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	711
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	712 # options
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	713 if i[1]:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	714 option_lists.append(("options", i[1]))
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	715
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	716 else:
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	717 # program name
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	718 if ui.verbose or with_version:
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	719 show_version(ui)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	720 else:
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	721 ui.status(_("Mercurial Distributed SCM\n"))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	722 ui.status('\n')
843 859e7ea530bd 'hg help -v' shows global options kreijack@inwind.REMOVEME.it parents: 842 diff changeset	723
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	724 # list of commands
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	725 if cmd == "shortlist":
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	726 ui.status(_('basic commands (use "hg help" '
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	727 'for the full list or option "-v" for details):\n\n'))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	728 elif ui.verbose:
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	729 ui.status(_('list of commands:\n\n'))
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	730 else:
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	731 ui.status(_('list of commands (use "hg help -v" '
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	732 'to show aliases and global options):\n\n'))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	733
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	734 h = {}
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	735 cmds = {}
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	736 for c, e in table.items():
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	737 f = c.split("\|")[0]
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	738 if cmd == "shortlist" and not f.startswith("^"):
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	739 continue
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	740 f = f.lstrip("^")
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	741 if not ui.debugflag and f.startswith("debug"):
ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	742 continue
1710 c65113f3627a Show "(No help text available)" for commands without doc string. Thomas Arendsen Hein <thomas@intevation.de> parents: 1661 diff changeset	743 doc = e[0].__doc__
c65113f3627a Show "(No help text available)" for commands without doc string. Thomas Arendsen Hein <thomas@intevation.de> parents: 1661 diff changeset	744 if not doc:
c65113f3627a Show "(No help text available)" for commands without doc string. Thomas Arendsen Hein <thomas@intevation.de> parents: 1661 diff changeset	745 doc = _("(No help text available)")
c65113f3627a Show "(No help text available)" for commands without doc string. Thomas Arendsen Hein <thomas@intevation.de> parents: 1661 diff changeset	746 h[f] = doc.splitlines(0)[0].rstrip()
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	747 cmds[f] = c.lstrip("^")
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	748
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	749 fns = h.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	750 fns.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	751 m = max(map(len, fns))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	752 for f in fns:
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	753 if ui.verbose:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	754 commands = cmds[f].replace("\|",", ")
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	755 ui.write(" %s:\n %s\n"%(commands, h[f]))
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	756 else:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	757 ui.write(' %-*s %s\n' % (m, f, h[f]))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	758
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	759 # global options
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	760 if ui.verbose:
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	761 option_lists.append(("global options", globalopts))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	762
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	763 # list all option lists
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	764 opt_output = []
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	765 for title, options in option_lists:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	766 opt_output.append(("\n%s:\n" % title, None))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	767 for shortopt, longopt, default, desc in options:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	768 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	769 longopt and " --%s" % longopt),
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	770 "%s%s" % (desc,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	771 default
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	772 and _(" (default: %s)") % default
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	773 or "")))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	774
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	775 if opt_output:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	776 opts_len = max([len(line[0]) for line in opt_output if line[1]])
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	777 for first, second in opt_output:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	778 if second:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	779 ui.write(" %-*s %s\n" % (opts_len, first, second))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	780 else:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	781 ui.write("%s\n" % first)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	782
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	783 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	784
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	785 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	786 """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	787
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	788 Schedule files to be version controlled and added to the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	789
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	790 The files will be added to the repository at the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	791
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	792 If no names are given, add all files in the repository.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	793 """
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	794
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	795 names = []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	796 for src, abs, rel, exact in walk(repo, pats, opts):
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	797 if exact:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	798 if ui.verbose:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	799 ui.status(_('adding %s\n') % rel)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	800 names.append(abs)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	801 elif repo.dirstate.state(abs) == '?':
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	802 ui.status(_('adding %s\n') % rel)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	803 names.append(abs)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	804 repo.add(names)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	805
766 b444a7e053f1 Get addremove to use new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 764 diff changeset	806 def addremove(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	807 """add all new files, delete all missing files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	808
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	809 Add all new files and remove all missing files from the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	810
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	811 New files are ignored if they match any of the patterns in .hgignore. As
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	812 with add, these changes take effect at the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	813 """
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1710 diff changeset	814 return addremove_lock(ui, repo, pats, opts)
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1710 diff changeset	815
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1710 diff changeset	816 def addremove_lock(ui, repo, pats, opts, wlock=None):
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	817 add, remove = [], []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	818 for src, abs, rel, exact in walk(repo, pats, opts):
880 409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	819 if src == 'f' and repo.dirstate.state(abs) == '?':
409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	820 add.append(abs)
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	821 if ui.verbose or not exact:
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	822 ui.status(_('adding %s\n') % ((pats and rel) or abs))
880 409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	823 if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	824 remove.append(abs)
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	825 if ui.verbose or not exact:
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	826 ui.status(_('removing %s\n') % ((pats and rel) or abs))
1712 21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1710 diff changeset	827 repo.add(add, wlock=wlock)
21dcf38e5d7d Allow callers to pass in the dirstate lock in most localrepo.py funcs. mason@suse.com parents: 1710 diff changeset	828 repo.remove(remove, wlock=wlock)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	829
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	830 def annotate(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	831 """show changeset information per file line
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	832
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	833 List changes in files, showing the revision id responsible for each line
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	834
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	835 This command is useful to discover who did a change or when a change took
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	836 place.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	837
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	838 Without the -a option, annotate will avoid processing files it
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	839 detects as binary. With -a, annotate will generate an annotation
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	840 anyway, probably with undesirable results.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	841 """
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	842 def getnode(rev):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	843 return short(repo.changelog.node(rev))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	844
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	845 ucache = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	846 def getname(rev):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	847 cl = repo.changelog.read(repo.changelog.node(rev))
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	848 return trimuser(ui, cl[1], rev, ucache)
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	849
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	850 dcache = {}
d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	851 def getdate(rev):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	852 datestr = dcache.get(rev)
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	853 if datestr is None:
d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	854 cl = repo.changelog.read(repo.changelog.node(rev))
d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	855 datestr = dcache[rev] = util.datestr(cl[2])
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	856 return datestr
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	857
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	858 if not pats:
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	859 raise util.Abort(_('at least one file name or pattern required'))
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	860
1523 fdda77dcf601 Fix line wrapping Matt Mackall <mpm@selenic.com> parents: 1522 diff changeset	861 opmap = [['user', getname], ['number', str], ['changeset', getnode],
fdda77dcf601 Fix line wrapping Matt Mackall <mpm@selenic.com> parents: 1522 diff changeset	862 ['date', getdate]]
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	863 if not opts['user'] and not opts['changeset'] and not opts['date']:
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	864 opts['number'] = 1
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	865
715 938dd667ca21 Make annotate use option --rev instead od --revision like other commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 714 diff changeset	866 if opts['rev']:
938dd667ca21 Make annotate use option --rev instead od --revision like other commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 714 diff changeset	867 node = repo.changelog.lookup(opts['rev'])
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	868 else:
29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	869 node = repo.dirstate.parents()[0]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	870 change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	871 mmap = repo.manifest.read(change[0])
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	872
1847 94498a262d15 fix annotate for removed files Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1840 diff changeset	873 for src, abs, rel, exact in walk(repo, pats, opts, node=node):
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	874 f = repo.file(abs)
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	875 if not opts['text'] and util.binary(f.read(mmap[abs])):
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	876 ui.write(_("%s: binary file\n") % ((pats and rel) or abs))
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	877 continue
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	878
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	879 lines = f.annotate(mmap[abs])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	880 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	881
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	882 for o, f in opmap:
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	883 if opts[o]:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	884 l = [f(n) for n, dummy in lines]
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	885 if l:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	886 m = max(map(len, l))
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	887 pieces.append(["%*s" % (m, x) for x in l])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	888
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	889 if pieces:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	890 for p, l in zip(zip(*pieces), lines):
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	891 ui.write("%s: %s" % (" ".join(p), l[1]))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	892
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	893 def bundle(ui, repo, fname, dest="default-push", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	894 """create a changegroup file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	895
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	896 Generate a compressed changegroup file collecting all changesets
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	897 not found in the other repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	898
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	899 This file can then be transferred using conventional means and
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	900 applied to another repository with the unbundle command. This is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	901 useful when native push and pull are not available or when
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	902 exporting an entire repository is undesirable. The standard file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	903 extension is ".hg".
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	904
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	905 Unlike import/export, this exactly preserves all changeset
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	906 contents including permissions, rename data, and revision history.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	907 """
1893 6569651a4f1e Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1892 diff changeset	908 dest = ui.expandpath(dest)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	909 other = hg.repository(ui, dest)
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	910 o = repo.findoutgoing(other, force=opts['force'])
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1734 diff changeset	911 cg = repo.changegroup(o, 'bundle')
1943 8198c60f7914 refactor the bundle writing code, since we will reuse it later Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1940 diff changeset	912 write_bundle(cg, fname)
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	913
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	914 def cat(ui, repo, file1, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	915 """output the latest or given revisions of files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	916
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	917 Print the specified files as they were at the given revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	918 If no revision is given then the tip is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	919
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	920 Output may be to a file, in which case the name of the file is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	921 given using a format string. The formatting rules are the same as
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	922 for the export command, with the following additions:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	923
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	924 %s basename of file being printed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	925 %d dirname of file being printed, or '.' if in repo root
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	926 %p root-relative path name of file being printed
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	927 """
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	928 mf = {}
1545 d69070c2547a fix errors found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1543 diff changeset	929 rev = opts['rev']
d69070c2547a fix errors found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1543 diff changeset	930 if rev:
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	931 node = repo.lookup(rev)
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	932 else:
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	933 node = repo.changelog.tip()
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	934 change = repo.changelog.read(node)
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	935 mf = repo.manifest.read(change[0])
63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	936 for src, abs, rel, exact in walk(repo, (file1,) + pats, opts, node):
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	937 r = repo.file(abs)
1582 63799b01985c fix the cat command Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	938 n = mf[abs]
1254 e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	939 fp = make_file(repo, r, opts['output'], node=n, pathname=abs)
e6560042b7b8 Switch cat command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1253 diff changeset	940 fp.write(r.read(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	941
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	942 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	943 """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	944
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	945 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	946
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	947 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	948 basename of the source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	949
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	950 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	951 .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	952
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	953 For efficiency, hardlinks are used for cloning whenever the source
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	954 and destination are on the same filesystem. Some filesystems,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	955 such as AFS, implement hardlinking incorrectly, but do not report
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	956 errors. In these cases, use the --pull option to avoid
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	957 hardlinking.
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	958
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	959 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	960 """
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	961 if dest is None:
528 648386fabf9c Fix clone bug wth trailing slash mpm@selenic.com parents: 527 diff changeset	962 dest = os.path.basename(os.path.normpath(source))
532 2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	963
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	964 if os.path.exists(dest):
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	965 raise util.Abort(_("destination '%s' already exists"), dest)
523 003df62ae39f [PATCH] Force "hg clone" to always create a new directory mpm@selenic.com parents: 522 diff changeset	966
891 a9b843b114f9 Fix clone when target directory is relative. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	967 dest = os.path.realpath(dest)
a9b843b114f9 Fix clone when target directory is relative. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	968
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	969 class Dircleanup(object):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	970 def __init__(self, dir_):
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	971 self.rmtree = shutil.rmtree
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	972 self.dir_ = dir_
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	973 os.mkdir(dir_)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	974 def close(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	975 self.dir_ = None
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	976 def __del__(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	977 if self.dir_:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	978 self.rmtree(self.dir_, True)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	979
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	980 if opts['ssh']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	981 ui.setconfig("ui", "ssh", opts['ssh'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	982 if opts['remotecmd']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	983 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	984
1892 622ee75cb4c9 Directory names take precedence over symbolic names consistently. Thomas Arendsen Hein <thomas@intevation.de> parents: 1889 diff changeset	985 source = ui.expandpath(source)
1314 d37a46859acd Fix default clone destination mpm@selenic.com parents: 1313 diff changeset	986
d37a46859acd Fix default clone destination mpm@selenic.com parents: 1313 diff changeset	987 d = Dircleanup(dest)
562 be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc mpm@selenic.com parents: 561 diff changeset	988 abspath = source
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 632 diff changeset	989 other = hg.repository(ui, source)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	990
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	991 copy = False
1315 32f6cae83db7 Fix setting of hg default when using --pull on clone of local repository. Lee Cantey <lcantey@gmail.com> parents: 1314 diff changeset	992 if other.dev() != -1:
675 49de76abc4da hg clone stored path fix Mikael Berthe <mikael@lilotux.net> parents: 674 diff changeset	993 abspath = os.path.abspath(source)
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	994 if not opts['pull'] and not opts['rev']:
1315 32f6cae83db7 Fix setting of hg default when using --pull on clone of local repository. Lee Cantey <lcantey@gmail.com> parents: 1314 diff changeset	995 copy = True
1331 cfae1ed2d61f Write hgrc file in text mode, even on Windows. Bryan O'Sullivan <bos@serpentine.com> parents: 1325 diff changeset	996
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	997 if copy:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	998 try:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	999 # we use a lock here because if we race with commit, we
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	1000 # can end up with extra data in the cloned revlogs that's
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	1001 # not pointed to by changesets, thus causing verify to
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	1002 # fail
1754 fdfe89a3962d use repo.lock when cloning via copy, use lock.LockException when necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	1003 l1 = other.lock()
fdfe89a3962d use repo.lock when cloning via copy, use lock.LockException when necessary Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	1004 except lock.LockException:
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	1005 copy = False
917 7f3f55903496 Fix hg clone race with writer mpm@selenic.com parents: 915 diff changeset	1006
1244 937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	1007 if copy:
937ee88da3ef clone: fall back to pull if we can't lock the source repo mpm@selenic.com parents: 1242 diff changeset	1008 # we lock here to avoid premature writing to the target
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	1009 os.mkdir(os.path.join(dest, ".hg"))
1209 920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	1010 l2 = lock.lock(os.path.join(dest, ".hg", "lock"))
1114 58371c4c2c8f Remove the lock file copied during clone (was the source lock file) Stephen Darnell parents: 1113 diff changeset	1011
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	1012 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	1013 for f in files.split():
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	1014 src = os.path.join(source, ".hg", f)
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	1015 dst = os.path.join(dest, ".hg", f)
1444 f84ed9c6131d fix for cloning empty repo (.hg is still empty) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1443 diff changeset	1016 try:
f84ed9c6131d fix for cloning empty repo (.hg is still empty) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1443 diff changeset	1017 util.copyfiles(src, dst)
f84ed9c6131d fix for cloning empty repo (.hg is still empty) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1443 diff changeset	1018 except OSError, inst:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1019 if inst.errno != errno.ENOENT:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1020 raise
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	1021
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	1022 repo = hg.repository(ui, dest)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	1023
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	1024 else:
1467 06d5d8794e5f Stupid spelling mistake in a variable name. Eric Hopper <hopper@omnifarious.org> parents: 1465 diff changeset	1025 revs = None
1461 02099220ad49 Implementing clone -r, which clones all changesets needed to reach a Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1026 if opts['rev']:
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1027 if not other.local():
1607 d72d27ee72b9 add '_' to several strings Muli Ben-Yehuda <mulix@mulix.org> parents: 1602 diff changeset	1028 error = _("clone -r not supported yet for remote repositories.")
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1029 raise util.Abort(error)
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1030 else:
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1031 revs = [other.lookup(rev) for rev in opts['rev']]
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1032 repo = hg.repository(ui, dest, create=1)
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	1033 repo.pull(other, heads = revs)
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	1034
1331 cfae1ed2d61f Write hgrc file in text mode, even on Windows. Bryan O'Sullivan <bos@serpentine.com> parents: 1325 diff changeset	1035 f = repo.opener("hgrc", "w", text=True)
1206 6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	1036 f.write("[paths]\n")
6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	1037 f.write("default = %s\n" % abspath)
1547 4dea10839201 close .hg/hgrc after writing the default values on clone TK Soh <teekaysoh@yahoo.com> parents: 1545 diff changeset	1038 f.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	1039
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	1040 if not opts['noupdate']:
1839 876e4e6ad82b Create local ui object per repository, so .hg/hgrc don't get mixed. Thomas Arendsen Hein <thomas@intevation.de> parents: 1835 diff changeset	1041 update(repo.ui, repo)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	1042
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	1043 d.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	1044
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1045 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	1046 """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	1047
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1048 Commit changes to the given files into the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1049
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1050 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	1051 will be committed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1052
1996 4c70b10f0418 Don't mention deprecated HGEDITOR variable in the help text of commit. Thomas Arendsen Hein <thomas@intevation.de> parents: 1995 diff changeset	1053 If no commit message is specified, the editor configured in your hgrc
4c70b10f0418 Don't mention deprecated HGEDITOR variable in the help text of commit. Thomas Arendsen Hein <thomas@intevation.de> parents: 1995 diff changeset	1054 or in the EDITOR environment variable is started to enter a message.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1055 """
1443 3a0b69ea5708 Remove deprecated commit -t option Matt Mackall <mpm@selenic.com> parents: 1440 diff changeset	1056 message = opts['message']
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1057 logfile = opts['logfile']
1319 5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	1058
5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	1059 if message and logfile:
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	1060 raise util.Abort(_('options --message and --logfile are mutually '
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	1061 'exclusive'))
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1062 if not message and logfile:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1063 try:
899 aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	1064 if logfile == '-':
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	1065 message = sys.stdin.read()
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	1066 else:
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	1067 message = open(logfile).read()
1319 5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	1068 except IOError, inst:
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	1069 raise util.Abort(_("can't read commit message '%s': %s") %
1319 5a15df632e6a Fix behaviour of commit. Bryan O'Sullivan <bos@serpentine.com> parents: 1318 diff changeset	1070 (logfile, inst.strerror))
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	1071
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	1072 if opts['addremove']:
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1073 addremove(ui, repo, pats, *opts)
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	1074 fns, match, anypats = matchpats(repo, pats, opts)
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1075 if pats:
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1076 modified, added, removed, deleted, unknown = (
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	1077 repo.changes(files=fns, match=match))
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1078 files = modified + added + removed
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1079 else:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1080 files = []
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1081 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1082 repo.commit(files, message, opts['user'], opts['date'], match)
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1083 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1084 raise util.Abort(str(inst))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1085
1822 64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1086 def docopy(ui, repo, pats, opts, wlock):
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1087 # called with the repo lock held
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1088 cwd = repo.getcwd()
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1089 errors = 0
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1090 copied = []
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1091 targets = {}
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1092
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1093 def okaytocopy(abs, rel, exact):
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	1094 reasons = {'?': _('is not managed'),
1634 f49f602fae92 copy & rename can ignore removed source files Robin Farine <robin.farine@terminus.org> parents: 1633 diff changeset	1095 'a': _('has been marked for add'),
f49f602fae92 copy & rename can ignore removed source files Robin Farine <robin.farine@terminus.org> parents: 1633 diff changeset	1096 'r': _('has been marked for remove')}
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1097 state = repo.dirstate.state(abs)
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1098 reason = reasons.get(state)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1099 if reason:
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1100 if state == 'a':
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1101 origsrc = repo.dirstate.copied(abs)
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1102 if origsrc is not None:
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1103 return origsrc
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1104 if exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1105 ui.warn(_('%s: not copying - file %s\n') % (rel, reason))
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1106 else:
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1107 return abs
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1108
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1109 def copy(origsrc, abssrc, relsrc, target, exact):
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1110 abstarget = util.canonpath(repo.root, cwd, target)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1111 reltarget = util.pathto(cwd, abstarget)
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1112 prevsrc = targets.get(abstarget)
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1113 if prevsrc is not None:
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1114 ui.warn(_('%s: not overwriting - %s collides with %s\n') %
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1115 (reltarget, abssrc, prevsrc))
faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1116 return
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1117 if (not opts['after'] and os.path.exists(reltarget) or
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1118 opts['after'] and repo.dirstate.state(abstarget) not in '?r'):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1119 if not opts['force']:
1513 5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	1120 ui.warn(_('%s: not overwriting - file exists\n') %
5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	1121 reltarget)
5c3b93b244aa copy & rename don't overwrite unless --force is specified Robin Farine <robin.farine@terminus.org> parents: 1512 diff changeset	1122 return
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1123 if not opts['after']:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1124 os.unlink(reltarget)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1125 if opts['after']:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1126 if not os.path.exists(reltarget):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1127 return
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1128 else:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1129 targetdir = os.path.dirname(reltarget) or '.'
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1130 if not os.path.isdir(targetdir):
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1131 os.makedirs(targetdir)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1132 try:
1822 64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1133 restore = repo.dirstate.state(abstarget) == 'r'
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1134 if restore:
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1135 repo.undelete([abstarget], wlock)
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1136 try:
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1137 shutil.copyfile(relsrc, reltarget)
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1138 shutil.copymode(relsrc, reltarget)
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1139 restore = False
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1140 finally:
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1141 if restore:
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1142 repo.remove([abstarget], wlock)
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1143 except shutil.Error, inst:
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1144 raise util.Abort(str(inst))
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1145 except IOError, inst:
a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1146 if inst.errno == errno.ENOENT:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1147 ui.warn(_('%s: deleted in working copy\n') % relsrc)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1148 else:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1149 ui.warn(_('%s: cannot copy - %s\n') %
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1150 (relsrc, inst.strerror))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1151 errors += 1
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1152 return
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1153 if ui.verbose or not exact:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1154 ui.status(_('copying %s to %s\n') % (relsrc, reltarget))
1514 faf46d810a85 avoid to copy more than one file to the same destination file Robin Farine <robin.farine@terminus.org> parents: 1513 diff changeset	1155 targets[abstarget] = abssrc
1822 64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1156 if abstarget != origsrc:
64df4220b349 copy/rename to a removed destination file Robin Farine <robin.farine@terminus.org> parents: 1812 diff changeset	1157 repo.copy(origsrc, abstarget, wlock)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1158 copied.append((abssrc, relsrc, exact))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1159
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1160 def targetpathfn(pat, dest, srcs):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1161 if os.path.isdir(pat):
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1162 abspfx = util.canonpath(repo.root, cwd, pat)
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1163 if destdirexists:
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1164 striplen = len(os.path.split(abspfx)[0])
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1165 else:
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1166 striplen = len(abspfx)
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1167 if striplen:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1168 striplen += len(os.sep)
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1169 res = lambda p: os.path.join(dest, p[striplen:])
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1170 elif destdirexists:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1171 res = lambda p: os.path.join(dest, os.path.basename(p))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1172 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1173 res = lambda p: dest
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1174 return res
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1175
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1176 def targetpathafterfn(pat, dest, srcs):
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1177 if util.patkind(pat, None)[0]:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1178 # a mercurial pattern
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1179 res = lambda p: os.path.join(dest, os.path.basename(p))
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1180 else:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1181 abspfx = util.canonpath(repo.root, cwd, pat)
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1182 if len(abspfx) < len(srcs[0][0]):
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1183 # A directory. Either the target path contains the last
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1184 # component of the source path or it does not.
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1185 def evalpath(striplen):
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1186 score = 0
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1187 for s in srcs:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1188 t = os.path.join(dest, s[0][striplen:])
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1189 if os.path.exists(t):
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1190 score += 1
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1191 return score
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1192
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1193 striplen = len(abspfx)
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1194 if striplen:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1195 striplen += len(os.sep)
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1196 if os.path.isdir(os.path.join(dest, os.path.split(abspfx)[1])):
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1197 score = evalpath(striplen)
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1198 striplen1 = len(os.path.split(abspfx)[0])
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1199 if striplen1:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1200 striplen1 += len(os.sep)
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1201 if evalpath(striplen1) > score:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1202 striplen = striplen1
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1203 res = lambda p: os.path.join(dest, p[striplen:])
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1204 else:
1633 94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1205 # a file
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1206 if destdirexists:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1207 res = lambda p: os.path.join(dest, os.path.basename(p))
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1208 else:
94c179a92f4a copy/rename '.' or '..' correctly Robin Farine <robin.farine@terminus.org> parents: 1626 diff changeset	1209 res = lambda p: dest
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1210 return res
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1211
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1212
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1213 pats = list(pats)
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1214 if not pats:
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1215 raise util.Abort(_('no source or destination specified'))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1216 if len(pats) == 1:
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1217 raise util.Abort(_('no destination specified'))
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1218 dest = pats.pop()
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1219 destdirexists = os.path.isdir(dest)
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1220 if (len(pats) > 1 or util.patkind(pats[0], None)[0]) and not destdirexists:
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1221 raise util.Abort(_('with multiple sources, destination must be an '
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1222 'existing directory'))
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1223 if opts['after']:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1224 tfn = targetpathafterfn
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1225 else:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1226 tfn = targetpathfn
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1227 copylist = []
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1228 for pat in pats:
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1229 srcs = []
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1230 for tag, abssrc, relsrc, exact in walk(repo, [pat], opts):
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1231 origsrc = okaytocopy(abssrc, relsrc, exact)
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1232 if origsrc:
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1233 srcs.append((origsrc, abssrc, relsrc, exact))
1565 4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1234 if not srcs:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1235 continue
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1236 copylist.append((tfn(pat, dest, srcs), srcs))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1237 if not copylist:
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1238 raise util.Abort(_('no files to copy'))
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1239
4bcbc126b80b fix rename --after Robin Farine <robin.farine@terminus.org> parents: 1561 diff changeset	1240 for targetpath, srcs in copylist:
1747 91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1241 for origsrc, abssrc, relsrc, exact in srcs:
91c56c427171 transitive copy/rename Robin Farine <robin.farine@terminus.org> parents: 1743 diff changeset	1242 copy(origsrc, abssrc, relsrc, targetpath(abssrc), exact)
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1243
53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1244 if errors:
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	1245 ui.warn(_('(consider using --after)\n'))
1512 53ad6ee6ede4 generalize copy/rename to handle more than one source directory Robin Farine <robin.farine@terminus.org> parents: 1507 diff changeset	1246 return errors, copied
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1247
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	1248 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	1249 """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	1250
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1251 Mark dest as having copies of source files. If dest is a
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1252 directory, copies are put in that directory. If dest is a file,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1253 there can only be one source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1254
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1255 By default, this command copies the contents of files as they
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1256 stand in the working directory. If invoked with --after, the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1257 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	1258
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1259 This command takes effect in the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1260
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1261 NOTE: This command should be treated as experimental. While it
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1262 should properly record copied files, this information is not yet
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1263 fully used by merge, nor fully reported by log.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1264 """
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	1265 wlock = repo.wlock(0)
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	1266 errs, copied = docopy(ui, repo, pats, opts, wlock)
1249 a5355fa5e33a Fix up copy command to behave more like regular "cp". Bryan O'Sullivan <bos@serpentine.com> parents: 1247 diff changeset	1267 return errs
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	1268
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	1269 def debugancestor(ui, index, rev1, rev2):
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	1270 """find the ancestor revision of two revisions in a given index"""
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1271 r = revlog.revlog(util.opener(os.getcwd(), audit=False), index, "", 0)
1262 325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	1272 a = r.ancestor(r.lookup(rev1), r.lookup(rev2))
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	1273 ui.write("%d:%s\n" % (r.rev(a), hex(a)))
325c07fd2ebd Add debugancestor command mpm@selenic.com parents: 1257 diff changeset	1274
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	1275 def debugcomplete(ui, cmd='', **opts):
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	1276 """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	1277
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	1278 if opts['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	1279 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	1280 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	1281 if cmd:
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	1282 aliases, entry = find(cmd)
5e7aff1b6ae1 add --options to debugcomplete and change bash_completion to use it Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2033 diff changeset	1283 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	1284 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	1285 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	1286 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	1287 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	1288 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	1289 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	1290 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	1291
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	1292 clist = findpossible(cmd).keys()
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	1293 clist.sort()
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	1294 ui.write("%s\n" % "\n".join(clist))
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	1295
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1296 def debugrebuildstate(ui, repo, rev=None):
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1297 """rebuild the dirstate as it would look like for the given revision"""
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1298 if not rev:
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1299 rev = repo.changelog.tip()
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1300 else:
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1301 rev = repo.lookup(rev)
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1302 change = repo.changelog.read(rev)
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1303 n = change[0]
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1304 files = repo.manifest.readflags(n)
1760 13f8e068d13c fix typo in debugrebuildstate Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1755 diff changeset	1305 wlock = repo.wlock()
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1306 repo.dirstate.rebuild(rev, files.iteritems())
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	1307
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1308 def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1309 """validate the correctness of the current dirstate"""
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1310 parent1, parent2 = repo.dirstate.parents()
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	1311 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	1312 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1313 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1314 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1315 m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1316 m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1317 m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1318 m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1319 errors = 0
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1320 for f in dc:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1321 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1322 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	1323 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	1324 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1325 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	1326 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	1327 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1328 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	1329 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	1330 (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1331 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1332 for f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1333 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1334 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	1335 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	1336 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1337 if errors:
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1338 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	1339 raise util.Abort(error)
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1340
1858 9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	1341 def debugconfig(ui, repo):
1053 1539ca091d86 Added missing doc strings for two new debug commmands. Thomas Arendsen Hein <thomas@intevation.de> parents: 1052 diff changeset	1342 """show combined config settings from all hgrc files"""
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1343 for section, name, value in ui.walkconfig():
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1344 ui.write('%s.%s=%s\n' % (section, name, value))
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1345
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1346 def debugsetparents(ui, repo, rev1, rev2=None):
1470 fb9b84c91222 minor fix on command help docstrings TK Soh <teekaysoh@yahoo.com> parents: 1469 diff changeset	1347 """manually set the parents of the current working directory
1395 c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1348
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1349 This is useful for writing repository conversion tools, but should
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1350 be used with care.
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1351 """
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1352
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1353 if not rev2:
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1354 rev2 = hex(nullid)
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1355
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1356 repo.dirstate.setparents(repo.lookup(rev1), repo.lookup(rev2))
c2eb204917f8 Add debugsetparents command Matt Mackall <mpm@selenic.com> parents: 1390 diff changeset	1357
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1358 def debugstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1359 """show the contents of the current dirstate"""
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	1360 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	1361 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1362 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1363 keys.sort()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1364 for file_ in keys:
791 040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1365 ui.write("%c %3o %10d %s %s\n"
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1366 % (dc[file_][0], dc[file_][1] & 0777, dc[file_][2],
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1367 time.strftime("%x %X",
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	1368 time.localtime(dc[file_][3])), file_))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1369 for f in repo.dirstate.copies:
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	1370 ui.write(_("copy: %s -> %s\n") % (repo.dirstate.copies[f], f))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	1371
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1372 def debugdata(ui, file_, rev):
4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1373 """dump the contents of an data file revision"""
1835 bdfb524d728a Validate paths before reading or writing files in repository or working dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1833 diff changeset	1374 r = revlog.revlog(util.opener(os.getcwd(), audit=False),
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1375 file_[:-2] + ".i", file_, 0)
1313 1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1376 try:
1cc7c0cbc30b Fix traceback during invalid rev identifier for debugdata Anupam Kapoor<anupam.kapoor@gmail.com> parents: 1312 diff changeset	1377 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	1378 except KeyError:
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	1379 raise util.Abort(_('invalid revision identifier %s'), rev)
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1380
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1381 def debugindex(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1382 """dump the contents of an index file"""
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1383 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1384 ui.write(" rev offset length base linkrev" +
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	1385 " nodeid p1 p2\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1386 for i in range(r.count()):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1387 node = r.node(i)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1388 pp = r.parents(node)
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	1389 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1390 i, r.start(i), r.length(i), r.base(i), r.linkrev(node),
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1391 short(node), short(pp[0]), short(pp[1])))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1392
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1393 def debugindexdot(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1394 """dump an index DAG as a .dot file"""
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2042 diff changeset	1395 r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_, "", 0)
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1396 ui.write("digraph G {\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1397 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1398 e = r.index[i]
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1399 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1400 if e[5] != nullid:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1401 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1402 ui.write("}\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1403
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1404 def debugrename(ui, repo, file, rev=None):
1194 c165cbf56bb1 Add doc string for debugrename. bos@serpentine.internal.keyresearch.com parents: 1193 diff changeset	1405 """dump rename information"""
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1406 r = repo.file(relpath(repo, [file])[0])
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1407 if rev:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1408 try:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1409 # assume all revision numbers are for changesets
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1410 n = repo.lookup(rev)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1411 change = repo.changelog.read(n)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1412 m = repo.manifest.read(change[0])
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1413 n = m[relpath(repo, [file])[0]]
1541 bf4e7ef08741 fixed some stuff pychecker shows, marked unclear/wrong stuff with XXX twaldmann@thinkmo.de parents: 1526 diff changeset	1414 except (hg.RepoError, KeyError):
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1415 n = r.lookup(rev)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1416 else:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1417 n = r.tip()
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1418 m = r.renamed(n)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1419 if m:
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	1420 ui.write(_("renamed from %s:%s\n") % (m[0], hex(m[1])))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1421 else:
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	1422 ui.write(_("not renamed\n"))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1423
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1424 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	1425 """show how files match on given patterns"""
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1426 items = list(walk(repo, pats, opts))
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1427 if not items:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1428 return
1309 332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1429 fmt = '%%s %%-%ds %%-%ds %%s' % (
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1430 max([len(abs) for (src, abs, rel, exact) in items]),
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1431 max([len(rel) for (src, abs, rel, exact) in items]))
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1432 for src, abs, rel, exact in items:
1309 332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1433 line = fmt % (src, abs, rel, exact and 'exact' or '')
332f225b835c Make debugwalk strip trailing spaces and remove these from test-walk.out Thomas Arendsen Hein <thomas@intevation.de> parents: 1285 diff changeset	1434 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	1435
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	1436 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	1437 """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	1438
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1439 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	1440
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1441 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	1442
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1443 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	1444 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	1445 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	1446 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	1447 to its parent.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1448
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1449 Without the -a option, diff will avoid generating diffs of files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1450 it detects as binary. With -a, diff will generate a diff anyway,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1451 probably with undesirable results.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1452 """
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1453 node1, node2 = None, None
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1454 revs = [repo.lookup(x) for x in opts['rev']]
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	1455
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1456 if len(revs) > 0:
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1457 node1 = revs[0]
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1458 if len(revs) > 1:
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1459 node2 = revs[1]
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1460 if len(revs) > 2:
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	1461 raise util.Abort(_("too many revisions to diff"))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1462
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	1463 fns, matchfn, anypats = matchpats(repo, pats, opts)
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	1464
1267 b0633406c07a Fix diff command so it doesn't walk the dirstate unnecessarily. Bryan O'Sullivan <bos@serpentine.com> parents: 1262 diff changeset	1465 dodiff(sys.stdout, ui, repo, node1, node2, fns, match=matchfn,
1728 9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	1466 text=opts['text'], opts=opts)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1467
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1468 def doexport(ui, repo, changeset, seqno, total, revwidth, opts):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1469 node = repo.lookup(changeset)
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1470 parents = [p for p in repo.changelog.parents(node) if p != nullid]
1589 fce5292866c6 fix a bug in hg export --switch-parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1586 diff changeset	1471 if opts['switch_parent']:
fce5292866c6 fix a bug in hg export --switch-parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1586 diff changeset	1472 parents.reverse()
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1473 prev = (parents and parents[0]) or nullid
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1474 change = repo.changelog.read(node)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1475
729 626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1476 fp = make_file(repo, repo.changelog, opts['output'],
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1477 node=node, total=total, seqno=seqno,
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1478 revwidth=revwidth)
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	1479 if fp != sys.stdout:
755 87e2b094ab86 Show filenames for hg export in verbose mode on a separate lines. Thomas Arendsen Hein <thomas@intevation.de> parents: 750 diff changeset	1480 ui.note("%s\n" % fp.name)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1481
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1482 fp.write("# HG changeset patch\n")
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1483 fp.write("# User %s\n" % change[1])
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1484 fp.write("# Node ID %s\n" % hex(node))
0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1485 fp.write("# Parent %s\n" % hex(prev))
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1486 if len(parents) > 1:
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1487 fp.write("# Parent %s\n" % hex(parents[1]))
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1488 fp.write(change[4].rstrip())
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	1489 fp.write("\n\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1490
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1491 dodiff(fp, ui, repo, prev, node, text=opts['text'])
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1492 if fp != sys.stdout:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1493 fp.close()
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	1494
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1495 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	1496 """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	1497
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1498 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	1499
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1500 The information shown in the changeset header is: author,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1501 changeset hash, parent and commit comment.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1502
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1503 Output may be to a file, in which case the name of the file is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1504 given using a format string. The formatting rules are as follows:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1505
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1506 %% literal "%" character
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1507 %H changeset hash (40 bytes of hexadecimal)
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1508 %N number of patches being generated
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1509 %R changeset revision number
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1510 %b basename of the exporting repository
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1511 %h short-form changeset hash (12 bytes of hexadecimal)
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1512 %n zero-padded sequence number, starting at 1
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1513 %r zero-padded changeset revision number
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1514
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1515 Without the -a option, export will avoid generating diffs of files
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1516 it detects as binary. With -a, export will generate a diff anyway,
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1517 probably with undesirable results.
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1518
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1519 With the --switch-parent option, the diff will be against the second
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	1520 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	1521 """
610 4c02464cb9f0 check export options for changeset before running shaleh@speakeasy.net parents: 609 diff changeset	1522 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	1523 raise util.Abort(_("export requires at least one changeset"))
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1524 seqno = 0
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1525 revs = list(revrange(ui, repo, changesets))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1526 total = len(revs)
1067 fae1204603dc Fixed zero-padded filenames with %r if there is a longer number in the middle. Thomas Arendsen Hein <thomas@intevation.de> parents: 1066 diff changeset	1527 revwidth = max(map(len, revs))
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1528 msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	1529 ui.note(msg)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1530 for cset in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1531 seqno += 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1532 doexport(ui, repo, cset, seqno, total, revwidth, opts)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1533
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1534 def forget(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1535 """don't 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	1536
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1537 Undo an 'hg add' scheduled for the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1538 """
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1539 forget = []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1540 for src, abs, rel, exact in walk(repo, pats, opts):
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1541 if repo.dirstate.state(abs) == 'a':
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1542 forget.append(abs)
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	1543 if ui.verbose or not exact:
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	1544 ui.status(_('forgetting %s\n') % ((pats and rel) or abs))
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	1545 repo.forget(forget)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1546
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1547 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	1548 """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	1549
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1550 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	1551
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1552 This command behaves differently than Unix grep. It only accepts
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1553 Python/Perl regexps. It searches repository history, not the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1554 working directory. It always prints the revision number in which
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1555 a match appears.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1556
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1557 By default, grep only prints output for the first revision of a
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1558 file in which it finds a match. To get it to print every revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1559 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	1560 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	1561 use the --all flag.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1562 """
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1563 reflags = 0
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1564 if opts['ignore_case']:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1565 reflags \|= re.I
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1566 regexp = re.compile(pattern, reflags)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1567 sep, eol = ':', '\n'
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1568 if opts['print0']:
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1569 sep = eol = '\0'
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1570
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1571 fcache = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1572 def getfile(fn):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1573 if fn not in fcache:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1574 fcache[fn] = repo.file(fn)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1575 return fcache[fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1576
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1577 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	1578 begin = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1579 linenum = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1580 while True:
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1581 match = regexp.search(body, begin)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1582 if not match:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1583 break
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1584 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	1585 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	1586 lstart = body.rfind('\n', begin, mstart) + 1 or begin
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1587 lend = body.find('\n', mend)
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1588 yield linenum, mstart - lstart, mend - lstart, body[lstart:lend]
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	1589 begin = lend + 1
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1590
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	1591 class linestate(object):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1592 def __init__(self, line, linenum, colstart, colend):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1593 self.line = line
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1594 self.linenum = linenum
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1595 self.colstart = colstart
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1596 self.colend = colend
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1597 def __eq__(self, other):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1598 return self.line == other.line
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1599 def __hash__(self):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1600 return hash(self.line)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1601
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1602 matches = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1603 def grepbody(fn, rev, body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1604 matches[rev].setdefault(fn, {})
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1605 m = matches[rev][fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1606 for lnum, cstart, cend, line in matchlines(body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1607 s = linestate(line, lnum, cstart, cend)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1608 m[s] = s
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1609
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1747 diff changeset	1610 # FIXME: prev isn't used, why ?
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1611 prev = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1612 ucache = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1613 def display(fn, rev, states, prevstates):
1061 fed8d078840b Fix set type usage for Python 2.3 mpm@selenic.com parents: 1060 diff changeset	1614 diff = list(sets.Set(states).symmetric_difference(sets.Set(prevstates)))
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1615 diff.sort(lambda x, y: cmp(x.linenum, y.linenum))
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1616 counts = {'-': 0, '+': 0}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1617 filerevmatches = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1618 for l in diff:
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1619 if incrementing or not opts['all']:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1620 change = ((l in prevstates) and '-') or '+'
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1621 r = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1622 else:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1623 change = ((l in states) and '-') or '+'
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1624 r = prev[fn]
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1625 cols = [fn, str(rev)]
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1626 if opts['line_number']:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1627 cols.append(str(l.linenum))
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1628 if opts['all']:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1629 cols.append(change)
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1630 if opts['user']:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1631 cols.append(trimuser(ui, getchange(rev)[1], rev,
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1632 ucache))
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1633 if opts['files_with_matches']:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1634 c = (fn, rev)
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1635 if c in filerevmatches:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1636 continue
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1637 filerevmatches[c] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1638 else:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1639 cols.append(l.line)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1640 ui.write(sep.join(cols), eol)
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1641 counts[change] += 1
bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1642 return counts['+'], counts['-']
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1643
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1644 fstate = {}
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1645 skip = {}
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1646 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1647 count = 0
1337 d4b25df77a9e Fix up some bugs for log and grep with empty repo mpm@selenic.com parents: 1331 diff changeset	1648 incrementing = False
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1649 for st, rev, fns in changeiter:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1650 if st == 'window':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1651 incrementing = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1652 matches.clear()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1653 elif st == 'add':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1654 change = repo.changelog.read(repo.lookup(str(rev)))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1655 mf = repo.manifest.read(change[0])
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1656 matches[rev] = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1657 for fn in fns:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1658 if fn in skip:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1659 continue
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1660 fstate.setdefault(fn, {})
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1661 try:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1662 grepbody(fn, rev, getfile(fn).read(mf[fn]))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1663 except KeyError:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1664 pass
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1665 elif st == 'iter':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1666 states = matches[rev].items()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1667 states.sort()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1668 for fn, m in states:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1669 if fn in skip:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1670 continue
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1671 if incrementing or not opts['all'] or fstate[fn]:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1672 pos, neg = display(fn, rev, m, fstate[fn])
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1673 count += pos + neg
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1674 if pos and not opts['all']:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	1675 skip[fn] = True
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1676 fstate[fn] = m
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1677 prev[fn] = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1678
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1679 if not incrementing:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1680 fstate = fstate.items()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1681 fstate.sort()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1682 for fn, state in fstate:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1683 if fn in skip:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1684 continue
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1685 display(fn, rev, {}, state)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1686 return (count == 0 and 1) or 0
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1687
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1688 def heads(ui, repo, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1689 """show current repository heads
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1690
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1691 Show all repository head changesets.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1692
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1693 Repository "heads" are changesets that don't have children
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1694 changesets. They are where development generally takes place and
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1695 are the usual targets for update and merge operations.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1696 """
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	1697 if opts['rev']:
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	1698 heads = repo.heads(repo.lookup(opts['rev']))
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	1699 else:
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	1700 heads = repo.heads()
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1701 br = None
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1702 if opts['branches']:
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	1703 br = repo.branchlookup(heads)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	1704 displayer = show_changeset(ui, repo, opts)
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	1705 for n in heads:
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	1706 displayer.show(changenode=n, brinfo=br)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1707
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1708 def identify(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1709 """print information about the working copy
1470 fb9b84c91222 minor fix on command help docstrings TK Soh <teekaysoh@yahoo.com> parents: 1469 diff changeset	1710
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1711 Print a short summary of the current state of the repo.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1712
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1713 This summary identifies the repository state using one or two parent
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1714 hash identifiers, followed by a "+" if there are uncommitted changes
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1715 in the working directory, followed by a list of tags for this revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1716 """
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1717 parents = [p for p in repo.dirstate.parents() if p != nullid]
340 97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	1718 if not parents:
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	1719 ui.write(_("unknown\n"))
340 97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	1720 return
97a897d32dfc Handle the case where the current working copy is not based on a checkout. Thomas Arendsen Hein <thomas@intevation.de> parents: 339 diff changeset	1721
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1722 hexfunc = ui.verbose and hex or short
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1723 modified, added, removed, deleted, unknown = repo.changes()
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1724 output = ["%s%s" %
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1725 ('+'.join([hexfunc(parent) for parent in parents]),
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1726 (modified or added or removed or deleted) and "+" or "")]
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1727
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1728 if not ui.quiet:
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1729 # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1730 parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1731 for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1732 # tags for multiple parents separated by ' + '
758 c5db9581bfa6 There was an extra space after 'hg id' when there are no tags. Thomas Arendsen Hein <thomas@intevation.de> parents: 757 diff changeset	1733 if parenttags:
c5db9581bfa6 There was an extra space after 'hg id' when there are no tags. Thomas Arendsen Hein <thomas@intevation.de> parents: 757 diff changeset	1734 output.append(' + '.join(parenttags))
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1735
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1736 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	1737
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1738 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	1739 """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	1740
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1741 Import a list of patches and commit them individually.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1742
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1743 If there are outstanding changes in the working directory, import
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1744 will abort unless given the -f flag.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1745
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1746 If a patch looks like a mail message (its first line starts with
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1747 "From " or looks like an RFC822 header), it will not be applied
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1748 unless the -f option is used. The importer neither parses nor
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1749 discards mail headers, so use -f only to override the "mailness"
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1750 safety check, not to import a real mail message.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1751 """
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1752 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1753
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1754 if not opts['force']:
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1755 modified, added, removed, deleted, unknown = repo.changes()
1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	1756 if modified or added or removed or deleted:
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	1757 raise util.Abort(_("outstanding uncommitted changes"))
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1758
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1759 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1760 strip = opts["strip"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1761
1193 04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1762 mailre = re.compile(r'(?:From \|[\w-]+:)')
1390 ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1763
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1764 # attempt to detect the start of a patch
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1765 # (this heuristic is borrowed from quilt)
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1766 diffre = re.compile(r'(?:Index:[ \t]\|diff[ \t]\|RCS file: \|' +
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1767 'retrieving revision [0-9]+(\.[0-9]+)*$\|' +
ce95599eedac Borrow patch header detection heuristic from quilt Matt Mackall <mpm@selenic.com> parents: 1381 diff changeset	1768 '(---\|\\\*)[ \t])')
1190 737f9b90c571 Make import command reject patches that resemble email messages. bos@serpentine.internal.keyresearch.com parents: 1189 diff changeset	1769
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1770 for patch in patches:
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	1771 ui.status(_("applying %s\n") % patch)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1772 pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1773
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1774 message = []
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1775 user = None
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1776 hgpatch = False
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1777 for line in file(pf):
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1778 line = line.rstrip()
1220 8baa29e36b14 import: fix bug in mail-format detection mpm@selenic.com parents: 1218 diff changeset	1779 if (not message and not hgpatch and
8baa29e36b14 import: fix bug in mail-format detection mpm@selenic.com parents: 1218 diff changeset	1780 mailre.match(line) and not opts['force']):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1781 if len(line) > 35:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1782 line = line[:32] + '...'
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	1783 raise util.Abort(_('first line looks like a '
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	1784 'mail header: ') + line)
1193 04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1785 if diffre.match(line):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1786 break
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1787 elif hgpatch:
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1788 # parse values when importing the result of an hg export
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1789 if line.startswith("# User "):
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1790 user = line[7:]
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	1791 ui.debug(_('User: %s\n') % user)
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1792 elif not line.startswith("# ") and line:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1793 message.append(line)
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1794 hgpatch = False
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1795 elif line == '# HG changeset patch':
607 94744f6fe0e7 [PATCH] Parse and use header data from an hg export'ed changeset mpm@selenic.com parents: 605 diff changeset	1796 hgpatch = True
852 1df0983eb589 Allow HG patch to appear late in the input stream Samuel Tardieu <sam@rfc1149.net> parents: 849 diff changeset	1797 message = [] # We may have collected garbage
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1798 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1799 message.append(line)
607 94744f6fe0e7 [PATCH] Parse and use header data from an hg export'ed changeset mpm@selenic.com parents: 605 diff changeset	1800
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1801 # make sure message isn't empty
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1802 if not message:
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	1803 message = _("imported patch %s\n") % patch
701 80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1804 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1805 message = "%s\n" % '\n'.join(message)
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	1806 ui.debug(_('message:\n%s\n') % message)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1807
1285 1546c2aa6b30 Make 'hg import' platform independent. Volker Kleinfeld <Volker.Kleinfeld@gmx.de> parents: 1281 diff changeset	1808 files = util.patch(strip, pf, ui)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1809
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1810 if len(files) > 0:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1811 addremove(ui, repo, *files)
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1812 repo.commit(files, message, user)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1813
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1814 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	1815 """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	1816
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	1817 Show new changesets found in the specified path/URL or the default
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	1818 pull location. These are the changesets that would be pulled if a pull
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1819 was requested.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1820
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1821 For remote repository, using --bundle avoids downloading the changesets
fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1822 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	1823
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	1824 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	1825 """
1893 6569651a4f1e Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1892 diff changeset	1826 source = ui.expandpath(source)
1965 62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	1827 if opts['ssh']:
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	1828 ui.setconfig("ui", "ssh", opts['ssh'])
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	1829 if opts['remotecmd']:
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	1830 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	1831
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1832 other = hg.repository(ui, source)
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	1833 incoming = repo.findincoming(other, force=opts["force"])
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1834 if not incoming:
1993 fb6ca9801d04 show message if no changes found on incoming TK Soh <teekaysoh@yahoo.com> parents: 1981 diff changeset	1835 ui.status(_("no changes found\n"))
931 32e8f64b25b0 Fix incoming for empty set mpm@selenic.com parents: 928 diff changeset	1836 return
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1837
fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1838 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	1839 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	1840 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	1841 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	1842 # create a bundle (uncompressed if other repo is not 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	1843 cg = other.changegroup(incoming, "incoming")
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1844 fname = cleanup = write_bundle(cg, fname, compress=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	1845 # 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	1846 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	1847 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	1848 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	1849 # 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	1850 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	1851
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1852 o = other.changelog.nodesbetween(incoming)[0]
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1853 if opts['newest_first']:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1854 o.reverse()
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1855 displayer = show_changeset(ui, other, opts)
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1856 for n in o:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1857 parents = [p for p in other.changelog.parents(n) if p != nullid]
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1858 if opts['no_merges'] and len(parents) == 2:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1859 continue
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1860 displayer.show(changenode=n)
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1861 if opts['patch']:
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1862 prev = (parents and parents[0]) or nullid
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1863 dodiff(ui, ui, other, prev, n)
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1864 ui.write("\n")
0d54675cd566 Delete bundle file of hg incoming in case of errors, preserve existing files. Thomas Arendsen Hein <thomas@intevation.de> parents: 1973 diff changeset	1865 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	1866 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	1867 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	1868 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	1869 os.unlink(cleanup)
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	1870
907 652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1871 def init(ui, dest="."):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1872 """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	1873
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1874 Initialize a new repository in the given directory. If the given
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1875 directory does not exist, it is created.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1876
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1877 If no directory is given, the current directory is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1878 """
907 652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1879 if not os.path.exists(dest):
652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1880 os.mkdir(dest)
652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1881 hg.repository(ui, dest, create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	1882
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1883 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	1884 """locate files matching specific patterns
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1885
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1886 Print all files under Mercurial control whose names match the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1887 given patterns.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1888
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1889 This command searches the current directory and its
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1890 subdirectories. To search an entire repository, move to the root
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1891 of the repository.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1892
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1893 If no patterns are given to match, this command prints all file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1894 names.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1895
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1896 If you want to feed the output of this command into the "xargs"
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1897 command, use the "-0" option to both this command and "xargs".
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1898 This will avoid the problem of "xargs" treating single filenames
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1899 that contain white space as multiple filenames.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1900 """
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1901 end = opts['print0'] and '\0' or '\n'
1622 5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1902 rev = opts['rev']
5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1903 if rev:
5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1904 node = repo.lookup(rev)
5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1905 else:
5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1906 node = None
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	1907
1622 5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1908 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1909 head='(?:.*/\|)'):
5e9168401a68 fix locate broken since 63799b01985c Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1619 diff changeset	1910 if not node and repo.dirstate.state(abs) == '?':
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1911 continue
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1912 if opts['fullpath']:
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1913 ui.write(os.path.join(repo.root, abs), end)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1914 else:
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	1915 ui.write(((pats and rel) or abs), end)
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1916
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1917 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	1918 """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	1919
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1920 Print the revision history of the specified files or the entire project.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1921
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1922 By default this command outputs: changeset id and hash, tags,
1557 f7d9823e65df Updated help text for 'hg log'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1552 diff changeset	1923 non-trivial parents, user, date and time, and a summary for each
f7d9823e65df Updated help text for 'hg log'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1552 diff changeset	1924 commit. When the -v/--verbose switch is used, the list of changed
f7d9823e65df Updated help text for 'hg log'. Thomas Arendsen Hein <thomas@intevation.de> parents: 1552 diff changeset	1925 files and full commit message is shown.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	1926 """
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1552 diff changeset	1927 class dui(object):
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1928 # Implement and delegate some ui protocol. Save hunks of
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1929 # output for later display in the desired order.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1930 def __init__(self, ui):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1931 self.ui = ui
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1932 self.hunk = {}
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	1933 self.header = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1934 def bump(self, rev):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1935 self.rev = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1936 self.hunk[rev] = []
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	1937 self.header[rev] = []
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1938 def note(self, *args):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1939 if self.verbose:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1940 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1941 def status(self, *args):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1942 if not self.quiet:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1943 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1944 def write(self, *args):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1945 self.hunk[self.rev].append(args)
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	1946 def write_header(self, *args):
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	1947 self.header[self.rev].append(args)
1381 c29c36745c6e log --debug: fix misplaced manifest field TK Soh <teekaysoh@yahoo.com> parents: 1380 diff changeset	1948 def debug(self, *args):
c29c36745c6e log --debug: fix misplaced manifest field TK Soh <teekaysoh@yahoo.com> parents: 1380 diff changeset	1949 if self.debugflag:
c29c36745c6e log --debug: fix misplaced manifest field TK Soh <teekaysoh@yahoo.com> parents: 1380 diff changeset	1950 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1951 def __getattr__(self, key):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1952 return getattr(self.ui, key)
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1953
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1954 changeiter, getchange, matchfn = walkchangerevs(ui, repo, pats, opts)
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1955
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1956 if opts['limit']:
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1957 try:
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1958 limit = int(opts['limit'])
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1959 except ValueError:
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1960 raise util.Abort(_('limit must be a positive integer'))
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1961 if limit <= 0: raise util.Abort(_('limit must be positive'))
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1962 else:
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1963 limit = sys.maxint
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1964 count = 0
f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	1965
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	1966 displayer = show_changeset(ui, repo, opts)
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1967 for st, rev, fns in changeiter:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1968 if st == 'window':
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1969 du = dui(ui)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	1970 displayer.ui = du
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1971 elif st == 'add':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1972 du.bump(rev)
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1973 changenode = repo.changelog.node(rev)
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1974 parents = [p for p in repo.changelog.parents(changenode)
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1975 if p != nullid]
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1976 if opts['no_merges'] and len(parents) == 2:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1977 continue
1436 db6d7b4005ba add --only-merges (-m) log Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1435 diff changeset	1978 if opts['only_merges'] and len(parents) != 2:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	1979 continue
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1980
1373 965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1981 if opts['keyword']:
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	1982 changes = getchange(rev)
1373 965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1983 miss = 0
1404 67e20e27d8df log: make keyword search truly case-insensitive TK Soh <teekaysoh@yahoo.com> parents: 1402 diff changeset	1984 for k in [kw.lower() for kw in opts['keyword']]:
1373 965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1985 if not (k in changes[1].lower() or
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1986 k in changes[4].lower() or
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1987 k in " ".join(changes[3][:20]).lower()):
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1988 miss = 1
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1989 break
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1990 if miss:
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1991 continue
965d1db5c95d hg log: add -k for keyword searching Matt Mackall <mpm@selenic.com> parents: 1366 diff changeset	1992
1764 4671078dbfe7 Cleanup: Put initialization of br in front of --branches option handling. Thomas Arendsen Hein <thomas@intevation.de> parents: 1763 diff changeset	1993 br = None
1763 fa34a74efc40 Make option --branch vs. --branches more consistent. Thomas Arendsen Hein <thomas@intevation.de> parents: 1762 diff changeset	1994 if opts['branches']:
1405 6fd6527f95eb log: speedup keyword search when used with --branch TK Soh <teekaysoh@yahoo.com> parents: 1404 diff changeset	1995 br = repo.branchlookup([repo.changelog.node(rev)])
6fd6527f95eb log: speedup keyword search when used with --branch TK Soh <teekaysoh@yahoo.com> parents: 1404 diff changeset	1996
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	1997 displayer.show(rev, brinfo=br)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1998 if opts['patch']:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	1999 prev = (parents and parents[0]) or nullid
1570 6a104941d56a hg log -p should show file deletions Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1568 diff changeset	2000 dodiff(du, du, repo, prev, changenode, match=matchfn)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	2001 du.write("\n\n")
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	2002 elif st == 'iter':
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2003 if count == limit: break
2033 e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2004 if du.header[rev]:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2005 for args in du.header[rev]:
e3280d350792 Group changes done by the same developer on the same with --style=changelog Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2006 ui.write_header(*args)
1765 b9fac31f34c9 hg log --limit shouldn't count unprinted revisions (found by TK Soh) Thomas Arendsen Hein <thomas@intevation.de> parents: 1764 diff changeset	2007 if du.hunk[rev]:
b9fac31f34c9 hg log --limit shouldn't count unprinted revisions (found by TK Soh) Thomas Arendsen Hein <thomas@intevation.de> parents: 1764 diff changeset	2008 count += 1
b9fac31f34c9 hg log --limit shouldn't count unprinted revisions (found by TK Soh) Thomas Arendsen Hein <thomas@intevation.de> parents: 1764 diff changeset	2009 for args in du.hunk[rev]:
b9fac31f34c9 hg log --limit shouldn't count unprinted revisions (found by TK Soh) Thomas Arendsen Hein <thomas@intevation.de> parents: 1764 diff changeset	2010 ui.write(*args)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2011
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2012 def manifest(ui, repo, rev=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2013 """output the latest or given revision of the project manifest
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2014
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2015 Print a list of version controlled files for the given revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2016
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2017 The manifest is the list of files being version controlled. If no revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2018 is given then the tip is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2019 """
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2020 if rev:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	2021 try:
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	2022 # assume all revision numbers are for changesets
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	2023 n = repo.lookup(rev)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	2024 change = repo.changelog.read(n)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	2025 n = change[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2026 except hg.RepoError:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	2027 n = repo.manifest.lookup(rev)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2028 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2029 n = repo.manifest.tip()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2030 m = repo.manifest.read(n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	2031 mf = repo.manifest.readflags(n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2032 files = m.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2033 files.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2034
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2035 for f in files:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2036 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2037
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2038 def merge(ui, repo, node=None, **opts):
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2039 """Merge working directory with another revision
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2040
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2041 Merge the contents of the current working directory and the
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2042 requested revision. Files that changed between either parent are
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2043 marked as changed for the next commit and a commit must be
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2044 performed before any further updates are allowed.
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2045 """
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2046 return update(ui, repo, node=node, merge=True, **opts)
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2047
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	2048 def outgoing(ui, repo, dest="default-push", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2049 """show changesets not found in destination
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2050
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2051 Show changesets not found in the specified destination repository or
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2052 the default push location. These are the changesets that would be pushed
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2053 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	2054
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2055 See pull for valid destination format details.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2056 """
1893 6569651a4f1e Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1892 diff changeset	2057 dest = ui.expandpath(dest)
1965 62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2058 if opts['ssh']:
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2059 ui.setconfig("ui", "ssh", opts['ssh'])
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2060 if opts['remotecmd']:
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2061 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2062
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2063 other = hg.repository(ui, dest)
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	2064 o = repo.findoutgoing(other, force=opts['force'])
1994 78ef83c9e9e1 show message if no changes found on outgoing Thomas Arendsen Hein <thomas@intevation.de> parents: 1993 diff changeset	2065 if not o:
78ef83c9e9e1 show message if no changes found on outgoing Thomas Arendsen Hein <thomas@intevation.de> parents: 1993 diff changeset	2066 ui.status(_("no changes found\n"))
78ef83c9e9e1 show message if no changes found on outgoing Thomas Arendsen Hein <thomas@intevation.de> parents: 1993 diff changeset	2067 return
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1381 diff changeset	2068 o = repo.changelog.nodesbetween(o)[0]
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2069 if opts['newest_first']:
65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2070 o.reverse()
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2071 displayer = show_changeset(ui, repo, opts)
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2072 for n in o:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2073 parents = [p for p in repo.changelog.parents(n) if p != nullid]
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2074 if opts['no_merges'] and len(parents) == 2:
22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2075 continue
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2076 displayer.show(changenode=n)
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	2077 if opts['patch']:
1435 22b44fd9a166 add --no-merges (-M) for log, outgoing, incoming Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1431 diff changeset	2078 prev = (parents and parents[0]) or nullid
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	2079 dodiff(ui, ui, repo, prev, n)
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	2080 ui.write("\n")
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	2081
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2082 def parents(ui, repo, rev=None, branches=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2083 """show the parents of the working dir or revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2084
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2085 Print the working directory's parent revisions.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2086 """
706 5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	2087 if rev:
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	2088 p = repo.changelog.parents(repo.lookup(rev))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2089 else:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2090 p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2091
1724 5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	2092 br = None
1763 fa34a74efc40 Make option --branch vs. --branches more consistent. Thomas Arendsen Hein <thomas@intevation.de> parents: 1762 diff changeset	2093 if branches is not None:
1724 5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	2094 br = repo.branchlookup(p)
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2095 displayer = show_changeset(ui, repo, opts)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2096 for n in p:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2097 if n != nullid:
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2098 displayer.show(changenode=n, brinfo=br)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2099
1858 9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	2100 def paths(ui, repo, search=None):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2101 """show definition of symbolic path names
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2102
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2103 Show definition of symbolic path name NAME. If no name is given, show
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2104 definition of available names.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2105
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2106 Path names are defined in the [paths] section of /etc/mercurial/hgrc
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2107 and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2108 """
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2109 if search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2110 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2111 if name == search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2112 ui.write("%s\n" % path)
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2113 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	2114 ui.warn(_("not found!\n"))
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2115 return 1
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2116 else:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2117 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2118 ui.write("%s = %s\n" % (name, path))
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	2119
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2120 def postincoming(ui, repo, modheads, optupdate):
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2121 if modheads == 0:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2122 return
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2123 if optupdate:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2124 if modheads == 1:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2125 return update(ui, repo)
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2126 else:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2127 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	2128 if modheads > 1:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2129 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	2130 else:
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2131 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	2132
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	2133 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	2134 """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	2135
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2136 Pull changes from a remote repository to a local one.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2137
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2138 This finds all changes from the repository at the specified path
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2139 or URL and adds them to the local repository. By default, this
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2140 does not update the copy of the project in the working directory.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2141
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2142 Valid URLs are of the form:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2143
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2144 local/filesystem/path
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2145 http://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2146 https://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2147 ssh://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2148
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2149 Some notes about using SSH with Mercurial:
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2150 - SSH requires an accessible shell account on the destination machine
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2151 and a copy of hg in the remote path or specified with as remotecmd.
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2152 - /path is relative to the remote user's home directory by default.
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2153 Use two slashes at the start of a path to specify an absolute path.
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2154 - Mercurial doesn't use its own compression via SSH; the right thing
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2155 to do is to configure it in your ~/.ssh/ssh_config, e.g.:
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2156 Host *.mylocalnetwork.example.com
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2157 Compression off
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2158 Host *
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2159 Compression on
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2160 Alternatively specify "ssh -C" as your ssh command in your hgrc or
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2161 with the --ssh command line option.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2162 """
1893 6569651a4f1e Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1892 diff changeset	2163 source = ui.expandpath(source)
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	2164 ui.status(_('pulling from %s\n') % (source))
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	2165
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	2166 if opts['ssh']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	2167 ui.setconfig("ui", "ssh", opts['ssh'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	2168 if opts['remotecmd']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	2169 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	2170
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	2171 other = hg.repository(ui, source)
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	2172 revs = None
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	2173 if opts['rev'] and not other.local():
1607 d72d27ee72b9 add '_' to several strings Muli Ben-Yehuda <mulix@mulix.org> parents: 1602 diff changeset	2174 raise util.Abort(_("pull -r doesn't work for remote repositories yet"))
1465 be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	2175 elif opts['rev']:
be6b5ce60b7f Implementing pull -r and changing clone -r. Both now support Eric Hopper <hopper@omnifarious.org> parents: 1461 diff changeset	2176 revs = [other.lookup(rev) for rev in opts['rev']]
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2177 modheads = repo.pull(other, heads=revs, force=opts['force'])
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2178 return postincoming(ui, repo, modheads, opts['update'])
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	2179
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2180 def push(ui, repo, dest="default-push", **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2181 """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	2182
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2183 Push changes from the local repository to the given destination.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2184
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2185 This is the symmetrical operation for pull. It helps to move
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2186 changes from the current repository to a different one. If the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2187 destination is local this is identical to a pull in that directory
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2188 from the current one.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2189
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2190 By default, push will refuse to run if it detects the result would
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2191 increase the number of remote heads. This generally indicates the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2192 the client has forgotten to sync and merge before pushing.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2193
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2194 Valid URLs are of the form:
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2195
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2196 local/filesystem/path
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2197 ssh://[user@]host[:port][/path]
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2198
1979 d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2199 Look at the help text for the pull command for important details
d545fa1426b9 More detailed documentation about ssh:// URLs; fixes issue170. Thomas Arendsen Hein <thomas@intevation.de> parents: 1974 diff changeset	2200 about ssh:// URLs.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2201 """
1893 6569651a4f1e Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir. Thomas Arendsen Hein <thomas@intevation.de> parents: 1892 diff changeset	2202 dest = ui.expandpath(dest)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	2203 ui.status('pushing to %s\n' % (dest))
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	2204
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2205 if opts['ssh']:
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2206 ui.setconfig("ui", "ssh", opts['ssh'])
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2207 if opts['remotecmd']:
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2208 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	2209
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	2210 other = hg.repository(ui, dest)
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2211 revs = None
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2212 if opts['rev']:
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2213 revs = [repo.lookup(rev) for rev in opts['rev']]
284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	2214 r = repo.push(other, opts['force'], revs=revs)
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2215 return r == 0
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	2216
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	2217 def rawcommit(ui, repo, flist, *rc):
1812 a81f99dfaa2a fix the synopsis of some commands, mark rawcommit as deprecated in short help Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1811 diff changeset	2218 """raw commit interface (DEPRECATED)
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2219
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2220 (DEPRECATED)
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2221 Lowlevel commit, for use in helper scripts.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2222
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2223 This command is not intended to be used by normal users, as it is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2224 primarily useful for importing from other SCMs.
1657 dbb8bba48510 deprecate the rawcommit command Matt Mackall <mpm@selenic.com> parents: 1654 diff changeset	2225
dbb8bba48510 deprecate the rawcommit command Matt Mackall <mpm@selenic.com> parents: 1654 diff changeset	2226 This command is now deprecated and will be removed in a future
dbb8bba48510 deprecate the rawcommit command Matt Mackall <mpm@selenic.com> parents: 1654 diff changeset	2227 release, please use debugsetparents and commit instead.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2228 """
1657 dbb8bba48510 deprecate the rawcommit command Matt Mackall <mpm@selenic.com> parents: 1654 diff changeset	2229
dbb8bba48510 deprecate the rawcommit command Matt Mackall <mpm@selenic.com> parents: 1654 diff changeset	2230 ui.warn(_("(the rawcommit command is deprecated)\n"))
dbb8bba48510 deprecate the rawcommit command Matt Mackall <mpm@selenic.com> parents: 1654 diff changeset	2231
1496 3cf287a03664 remove the deprecated --text (t) option to rawcommit and tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1490 diff changeset	2232 message = rc['message']
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	2233 if not message and rc['logfile']:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2234 try:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	2235 message = open(rc['logfile']).read()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2236 except IOError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2237 pass
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	2238 if not message and not rc['logfile']:
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	2239 raise util.Abort(_("missing commit message"))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	2240
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	2241 files = relpath(repo, list(flist))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	2242 if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	2243 files += open(rc['files']).read().splitlines()
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	2244
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	2245 rc['parent'] = map(repo.lookup, rc['parent'])
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	2246
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2247 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2248 repo.rawcommit(files, message, rc['user'], rc['date'], *rc['parent'])
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2249 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2250 raise util.Abort(str(inst))
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	2251
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2252 def recover(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2253 """roll back an interrupted transaction
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2254
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2255 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	2256
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2257 This command tries to fix the repository status after an interrupted
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2258 operation. It should only be necessary when Mercurial suggests it.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2259 """
1516 0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	2260 if repo.recover():
0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	2261 return repo.verify()
0b1b029b4de3 Automatically run "verify" whenever we run "recover" Matt Mackall <mpm@selenic.com> parents: 1514 diff changeset	2262 return False
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2263
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	2264 def remove(ui, repo, pat, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2265 """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	2266
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2267 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	2268
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2269 This command schedules the files to be removed at the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2270 This only removes files from the current branch, not from the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2271 entire project history. If the files still exist in the working
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2272 directory, they will be deleted from it.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2273 """
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	2274 names = []
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	2275 def okaytoremove(abs, rel, exact):
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	2276 modified, added, removed, deleted, unknown = repo.changes(files=[abs])
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	2277 reason = None
1867 91ebf29c1595 add -f/--force to remove command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1859 diff changeset	2278 if modified and not opts['force']:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2279 reason = _('is modified')
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2280 elif added:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2281 reason = _('has been marked for add')
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2282 elif unknown:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2283 reason = _('is not managed')
1255 e825dfea3823 Get all commands that operate on files to honour --verbose and --quiet. Bryan O'Sullivan <bos@serpentine.com> parents: 1254 diff changeset	2284 if reason:
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2285 if exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2286 ui.warn(_('not removing %s: file %s\n') % (rel, reason))
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	2287 else:
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	2288 return True
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	2289 for src, abs, rel, exact in walk(repo, (pat,) + pats, opts):
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	2290 if okaytoremove(abs, rel, exact):
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2291 if ui.verbose or not exact:
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2292 ui.status(_('removing %s\n') % rel)
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	2293 names.append(abs)
1415 c6e6ca96a033 refactor some unlink/remove code and make sure we prune empty dir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1413 diff changeset	2294 repo.remove(names, unlink=True)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2295
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2296 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	2297 """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	2298
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2299 Mark dest as copies of sources; mark sources for deletion. If
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2300 dest is a directory, copies are put in that directory. If dest is
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2301 a file, there can only be one source.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2302
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2303 By default, this command copies the contents of files as they
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2304 stand in the working directory. If invoked with --after, the
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2305 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	2306
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2307 This command takes effect in the next commit.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2308
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2309 NOTE: This command should be treated as experimental. While it
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2310 should properly record rename files, this information is not yet
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2311 fully used by merge, nor fully reported by log.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2312 """
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2313 wlock = repo.wlock(0)
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2314 errs, copied = docopy(ui, repo, pats, opts, wlock)
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2315 names = []
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2316 for abs, rel, exact in copied:
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2317 if ui.verbose or not exact:
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2318 ui.status(_('removing %s\n') % rel)
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2319 names.append(abs)
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2320 repo.remove(names, True, wlock)
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2321 return errs
a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2322
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	2323 def revert(ui, repo, pats, *opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2324 """revert modified files or dirs back to their unmodified states
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2325
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2326 In its default mode, it reverts any uncommitted modifications made
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2327 to the named files or directories. This restores the contents of
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2328 the affected files to an unmodified state.
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2329
2036 c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2330 Modified files are saved with a .orig suffix before reverting.
c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2331 To disable these backups, use --no-backup.
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2332
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2333 Using the -r option, it reverts the given files or directories to
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2334 their state as of an earlier revision. This can be helpful to "roll
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2335 back" some or all of a change that should not have been committed.
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2336
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2337 Revert modifies the working directory. It does not commit any
6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	2338 changes, or change the parent 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	2339
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2340 If a file has been deleted, it is recreated. If the executable
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2341 mode of a file was changed, it is reset.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2342
1472 3c909a747d7f make revert use standard matcher Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1470 diff changeset	2343 If names are given, all files matching the names are reverted.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2344
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	2345 If no arguments are given, all files in the repository are reverted.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2346 """
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2347 parent = repo.dirstate.parents()[0]
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2348 node = opts['rev'] and repo.lookup(opts['rev']) or parent
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2349 mf = repo.manifest.read(repo.changelog.read(node)[0])
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2350
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2351 wlock = repo.wlock()
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2352
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2353 # 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	2354 # 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	2355 # but not other.
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2356
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2357 names = {}
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2358 target_only = {}
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2359
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2360 # walk dirstate.
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2361
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2362 for src, abs, rel, exact in walk(repo, pats, opts, badmatch=mf.has_key):
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2363 names[abs] = (rel, exact)
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2364 if src == 'b':
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2365 target_only[abs] = True
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2366
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2367 # walk target manifest.
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2368
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2369 for src, abs, rel, exact in walk(repo, pats, opts, node=node,
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2370 badmatch=names.has_key):
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2371 if abs in names: continue
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2372 names[abs] = (rel, exact)
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2373 target_only[abs] = True
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2374
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2375 changes = repo.changes(match=names.has_key, wlock=wlock)
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2376 modified, added, removed, deleted, unknown = map(dict.fromkeys, changes)
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2377
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2378 revert = ([], _('reverting %s\n'))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2379 add = ([], _('adding %s\n'))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2380 remove = ([], _('removing %s\n'))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2381 forget = ([], _('forgetting %s\n'))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2382 undelete = ([], _('undeleting %s\n'))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2383 update = {}
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2384
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2385 disptable = (
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2386 # dispatch table:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2387 # file state
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2388 # action if in target manifest
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2389 # action if not in target manifest
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2390 # make backup if in target manifest
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2391 # make backup if not in target manifest
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2392 (modified, revert, remove, True, True),
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2393 (added, revert, forget, True, True),
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2394 (removed, undelete, None, False, False),
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2395 (deleted, revert, remove, False, False),
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2396 (unknown, add, None, True, False),
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2397 (target_only, add, None, False, False),
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2398 )
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2399
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2400 entries = names.items()
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2401 entries.sort()
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2402
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2403 for abs, (rel, exact) in entries:
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2404 in_mf = abs in mf
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2405 def handle(xlist, dobackup):
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2406 xlist[0].append(abs)
2036 c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2407 if dobackup and not opts['no_backup'] and os.path.exists(rel):
c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2408 bakname = "%s.orig" % rel
c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2409 ui.note(_('saving current version of %s as %s\n') %
c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2410 (rel, bakname))
c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2411 shutil.copyfile(rel, bakname)
c9226bcc288d Don't abort when backup files already exist. Don't allow alternative names. Thomas Arendsen Hein <thomas@intevation.de> parents: 2029 diff changeset	2412 shutil.copymode(rel, bakname)
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2413 if ui.verbose or not exact:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2414 ui.status(xlist[1] % rel)
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2415 for table, hitlist, misslist, backuphit, backupmiss in disptable:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2416 if abs not in table: continue
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2417 # file has changed in dirstate
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2418 if in_mf:
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2419 handle(hitlist, backuphit)
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2420 elif misslist is not None:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2421 handle(misslist, backupmiss)
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2422 else:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2423 if exact: ui.warn(_('file not managed: %s\n' % rel))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2424 break
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2425 else:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2426 # file has not changed in dirstate
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2427 if node == parent:
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2428 if exact: ui.warn(_('no changes needed to %s\n' % rel))
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2429 continue
2042 a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2430 if not in_mf:
a514c7509fa9 small changes to revert command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2037 diff changeset	2431 handle(remove, False)
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2432 update[abs] = True
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2433
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2434 repo.dirstate.forget(forget[0])
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2435 r = repo.update(node, False, True, update.has_key, False, wlock=wlock)
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2436 repo.dirstate.update(add[0], 'a')
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2437 repo.dirstate.update(undelete[0], 'n')
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2438 repo.dirstate.update(remove[0], 'r')
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	2439 return r
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	2440
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	2441 def root(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2442 """print the root (top) of the current working dir
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2443
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2444 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	2445 """
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	2446 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	2447
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2448 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	2449 """export the repository via HTTP
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2450
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2451 Start a local HTTP repository browser and pull server.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2452
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2453 By default, the server logs accesses to stdout and errors to
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2454 stderr. Use the "-A" and "-E" options to log to files.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2455 """
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2456
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2457 if opts["stdio"]:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2458 fin, fout = sys.stdin, sys.stdout
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2459 sys.stdout = sys.stderr
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2460
1420 b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	2461 # Prevent insertion/deletion of CRs
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	2462 util.set_binary(fin)
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	2463 util.set_binary(fout)
b32b3509c7ab Avoid insertion/deletion of CRs on stdio during hg serve olivier.maquelin@intel.com parents: 1415 diff changeset	2464
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2465 def getarg():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2466 argline = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2467 arg, l = argline.split()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2468 val = fin.read(int(l))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2469 return arg, val
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2470 def respond(v):
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2471 fout.write("%d\n" % len(v))
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2472 fout.write(v)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2473 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2474
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2475 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2476
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2477 while 1:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2478 cmd = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2479 if cmd == '':
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2480 return
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2481 if cmd == "heads":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2482 h = repo.heads()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2483 respond(" ".join(map(hex, h)) + "\n")
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2484 if cmd == "lock":
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2485 lock = repo.lock()
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2486 respond("")
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2487 if cmd == "unlock":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2488 if lock:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2489 lock.release()
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2490 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	2491 respond("")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2492 elif cmd == "branches":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2493 arg, nodes = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2494 nodes = map(bin, nodes.split(" "))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2495 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2496 for b in repo.branches(nodes):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2497 r.append(" ".join(map(hex, b)) + "\n")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2498 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2499 elif cmd == "between":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2500 arg, pairs = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2501 pairs = [map(bin, p.split("-")) for p in pairs.split(" ")]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2502 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2503 for b in repo.between(pairs):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2504 r.append(" ".join(map(hex, b)) + "\n")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2505 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2506 elif cmd == "changegroup":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2507 nodes = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2508 arg, roots = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2509 nodes = map(bin, roots.split(" "))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2510
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1734 diff changeset	2511 cg = repo.changegroup(nodes, 'serve')
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2512 while 1:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2513 d = cg.read(4096)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2514 if not d:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2515 break
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	2516 fout.write(d)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2517
667 31a9aa890016 A number of minor fixes to problems that pychecker found. mark.williamson@cl.cam.ac.uk parents: 654 diff changeset	2518 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	2519
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2520 elif cmd == "addchangegroup":
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2521 if not lock:
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2522 respond("not locked")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2523 continue
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2524 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2525
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2526 r = repo.addchangegroup(fin)
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2527 respond(str(r))
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	2528
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2529 optlist = "name templates style address port ipv6 accesslog errorlog"
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2530 for o in optlist.split():
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2531 if opts[o]:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2532 ui.setconfig("web", o, opts[o])
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2533
1741 9777298fed84 stop read end of pipe from staying open forever in child process. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1740 diff changeset	2534 if opts['daemon'] and not opts['daemon_pipefds']:
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2535 rfd, wfd = os.pipe()
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2536 args = sys.argv[:]
1741 9777298fed84 stop read end of pipe from staying open forever in child process. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1740 diff changeset	2537 args.append('--daemon-pipefds=%d,%d' % (rfd, wfd))
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2538 pid = os.spawnvp(os.P_NOWAIT \| getattr(os, 'P_DETACH', 0),
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2539 args[0], args)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2540 os.close(wfd)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2541 os.read(rfd, 1)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2542 os._exit(0)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2543
1177 862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	2544 try:
862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	2545 httpd = hgweb.create_server(repo)
862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	2546 except socket.error, inst:
1607 d72d27ee72b9 add '_' to several strings Muli Ben-Yehuda <mulix@mulix.org> parents: 1602 diff changeset	2547 raise util.Abort(_('cannot start server: ') + inst.args[1])
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	2548
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2549 if ui.verbose:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2550 addr, port = httpd.socket.getsockname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2551 if addr == '0.0.0.0':
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2552 addr = socket.gethostname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2553 else:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2554 try:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2555 addr = socket.gethostbyaddr(addr)[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2556 except socket.error:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2557 pass
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2558 if port != 80:
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	2559 ui.status(_('listening at http://%s:%d/\n') % (addr, port))
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2560 else:
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	2561 ui.status(_('listening at http://%s/\n') % addr)
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2562
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2563 if opts['pid_file']:
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2564 fp = open(opts['pid_file'], 'w')
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2565 fp.write(str(os.getpid()))
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2566 fp.close()
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2567
1741 9777298fed84 stop read end of pipe from staying open forever in child process. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1740 diff changeset	2568 if opts['daemon_pipefds']:
9777298fed84 stop read end of pipe from staying open forever in child process. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1740 diff changeset	2569 rfd, wfd = [int(x) for x in opts['daemon_pipefds'].split(',')]
9777298fed84 stop read end of pipe from staying open forever in child process. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1740 diff changeset	2570 os.close(rfd)
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2571 os.write(wfd, 'y')
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2572 os.close(wfd)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2573 sys.stdout.flush()
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2574 sys.stderr.flush()
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2575 fd = os.open(util.nulldev, os.O_RDWR)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2576 if fd != 0: os.dup2(fd, 0)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2577 if fd != 1: os.dup2(fd, 1)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2578 if fd != 2: os.dup2(fd, 2)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2579 if fd not in (0, 1, 2): os.close(fd)
f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	2580
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	2581 httpd.serve_forever()
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	2582
731 91ca3afab8e8 Add name matching to status command. Bryan O'Sullivan <bos@serpentine.com> parents: 729 diff changeset	2583 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	2584 """show changed files in the working directory
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2585
1568 1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	2586 Show changed files in the repository. If names are
1d7d0c07e8f3 make all commands be repo-wide by default Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1567 diff changeset	2587 given, only files that match are shown.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2588
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2589 The codes used to show the status of files are:
746 9095e3456ea7 Change C to M in status mpm@selenic.com parents: 745 diff changeset	2590 M = modified
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2591 A = added
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2592 R = removed
1619 1ba0d7041ac4 Distinguish removed and deleted files. Tests are not fixed yet. Thomas Arendsen Hein <thomas@intevation.de> parents: 1618 diff changeset	2593 ! = deleted, but still tracked
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2594 ? = not tracked
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2595 I = ignored (not shown by default)
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2596 """
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	2597
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2598 show_ignored = opts['ignored'] and True or False
1625 e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	2599 files, matchfn, anypats = matchpats(repo, pats, opts)
e1bcf7fa983f correct the relative path when walking from a subdir Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1622 diff changeset	2600 cwd = (pats and repo.getcwd()) or ''
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2601 modified, added, removed, deleted, unknown, ignored = [
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2602 [util.pathto(cwd, x) for x in n]
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2603 for n in repo.changes(files=files, match=matchfn,
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2604 show_ignored=show_ignored)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2605
1966 f8b0e73e320f hg status cleanups: Don't translate long options, remove stray semicolon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1965 diff changeset	2606 changetypes = [('modified', 'M', modified),
f8b0e73e320f hg status cleanups: Don't translate long options, remove stray semicolon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1965 diff changeset	2607 ('added', 'A', added),
f8b0e73e320f hg status cleanups: Don't translate long options, remove stray semicolon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1965 diff changeset	2608 ('removed', 'R', removed),
f8b0e73e320f hg status cleanups: Don't translate long options, remove stray semicolon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1965 diff changeset	2609 ('deleted', '!', deleted),
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2610 ('unknown', '?', unknown),
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	2611 ('ignored', 'I', ignored)]
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2612
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2613 end = opts['print0'] and '\0' or '\n'
1106 95a044b73bd5 Whitespace cleanup. Thomas Arendsen Hein <thomas@intevation.de> parents: 1105 diff changeset	2614
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2615 for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2616 or changetypes):
1105 a906b018eaef Replaced hg status -p/--strip with -n/--no-status to not confuse with patch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1085 diff changeset	2617 if opts['no_status']:
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2618 format = "%%s%s" % end
6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2619 else:
1966 f8b0e73e320f hg status cleanups: Don't translate long options, remove stray semicolon. Thomas Arendsen Hein <thomas@intevation.de> parents: 1965 diff changeset	2620 format = "%s %%s%s" % (char, end)
1106 95a044b73bd5 Whitespace cleanup. Thomas Arendsen Hein <thomas@intevation.de> parents: 1105 diff changeset	2621
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	2622 for f in changes:
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	2623 ui.write(format % f)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	2624
1596 41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2625 def tag(ui, repo, name, rev_=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2626 """add a tag for the current tip or a given revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2627
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2628 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	2629
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2630 Tags are used to name particular revisions of the repository and are
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2631 very useful to compare different revision, to go back to significant
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2632 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	2633
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2634 If no revision is given, the tip is used.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2635
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2636 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	2637 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	2638 similarly to other project files and can be hand-edited if
1654 b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	2639 necessary. The file '.hg/localtags' is used for local tags (not
b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	2640 shared among repositories).
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2641 """
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2642 if name == "tip":
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	2643 raise util.Abort(_("the name 'tip' is reserved"))
1654 b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	2644 if rev_ is not None:
b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	2645 ui.warn(_("use of 'hg tag NAME [REV]' is deprecated, "
1661 b11507d6d16d Added missing quote in warning text. Thomas Arendsen Hein <thomas@intevation.de> parents: 1657 diff changeset	2646 "please use 'hg tag [-r REV] NAME' instead\n"))
1654 b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	2647 if opts['rev']:
b7fc961507db deprecate the use of 'hg tag NAME [REV]' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1648 diff changeset	2648 raise util.Abort(_("use only one form to specify the revision"))
1596 41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2649 if opts['rev']:
41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2650 rev_ = opts['rev']
41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2651 if rev_:
41366b7d6709 fix 'hg tag <tagname> <revision> Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1589 diff changeset	2652 r = hex(repo.lookup(rev_))
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2653 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2654 r = hex(repo.changelog.tip())
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2655
1561 9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2656 disallowed = (revrangesep, '\r', '\n')
9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2657 for c in disallowed:
9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2658 if name.find(c) >= 0:
9c6d0abdb94e disallow '\n' and '\r' in tag names Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1560 diff changeset	2659 raise util.Abort(_("%s cannot be used in a tag name") % repr(c))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2660
1720 55017891051b add pretag and tag hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1712 diff changeset	2661 repo.hook('pretag', throw=True, node=r, tag=name,
1734 9488d53233b5 tests for new hooks. fix things i found when writing tests. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1732 diff changeset	2662 local=int(not not opts['local']))
1720 55017891051b add pretag and tag hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1712 diff changeset	2663
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2664 if opts['local']:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2665 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
1720 55017891051b add pretag and tag hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1712 diff changeset	2666 repo.hook('tag', node=r, tag=name, local=1)
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2667 return
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	2668
1618 ff339dd21976 Renamed c, a, d, u to modified, added, removed, unknown for users of changes() Thomas Arendsen Hein <thomas@intevation.de> parents: 1615 diff changeset	2669 for x in repo.changes():
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	2670 if ".hgtags" in x:
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	2671 raise util.Abort(_("working copy of .hgtags is changed "
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	2672 "(please commit .hgtags manually)"))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2673
617 285965ddca41 open .hgtags as binary thananck@yahoo.com parents: 615 diff changeset	2674 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
710 ca9353f43345 Use dirstate to check if .hgtags needs to be added. Thomas Arendsen Hein <thomas@intevation.de> parents: 709 diff changeset	2675 if repo.dirstate.state(".hgtags") == '?':
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2676 repo.add([".hgtags"])
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2677
1496 3cf287a03664 remove the deprecated --text (t) option to rawcommit and tag Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1490 diff changeset	2678 message = (opts['message'] or
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	2679 _("Added tag %s for changeset %s") % (name, r))
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2680 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2681 repo.commit([".hgtags"], message, opts['user'], opts['date'])
1720 55017891051b add pretag and tag hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1712 diff changeset	2682 repo.hook('tag', node=r, tag=name, local=0)
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2683 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	2684 raise util.Abort(str(inst))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	2685
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2686 def tags(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2687 """list repository tags
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2688
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2689 List the repository tags.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2690
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2691 This lists both regular and local tags.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2692 """
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2693
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	2694 l = repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	2695 l.reverse()
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2696 for t, n in l:
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2697 try:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	2698 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2699 except KeyError:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	2700 r = " ?:?"
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	2701 if ui.quiet:
107dc72880f8 Make 'hg tags -q' only list tag names without revision numbers and hashes, Thomas Arendsen Hein <thomas@intevation.de> parents: 2034 diff changeset	2702 ui.write("%s\n" % t)
107dc72880f8 Make 'hg tags -q' only list tag names without revision numbers and hashes, Thomas Arendsen Hein <thomas@intevation.de> parents: 2034 diff changeset	2703 else:
107dc72880f8 Make 'hg tags -q' only list tag names without revision numbers and hashes, Thomas Arendsen Hein <thomas@intevation.de> parents: 2034 diff changeset	2704 ui.write("%-30s %s\n" % (t, r))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	2705
1731 251729df9cc6 add -p option to tip. for issue 64. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1728 diff changeset	2706 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	2707 """show the tip revision
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2708
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2709 Show the tip revision.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2710 """
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2711 n = repo.changelog.tip()
1762 8eaa8e06a364 Add option -b/--branch to hg tip (as done for hg parents). Thomas Arendsen Hein <thomas@intevation.de> parents: 1761 diff changeset	2712 br = None
1763 fa34a74efc40 Make option --branch vs. --branches more consistent. Thomas Arendsen Hein <thomas@intevation.de> parents: 1762 diff changeset	2713 if opts['branches']:
1762 8eaa8e06a364 Add option -b/--branch to hg tip (as done for hg parents). Thomas Arendsen Hein <thomas@intevation.de> parents: 1761 diff changeset	2714 br = repo.branchlookup([n])
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2715 show_changeset(ui, repo, opts).show(changenode=n, brinfo=br)
1731 251729df9cc6 add -p option to tip. for issue 64. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1728 diff changeset	2716 if opts['patch']:
251729df9cc6 add -p option to tip. for issue 64. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1728 diff changeset	2717 dodiff(ui, ui, repo, repo.changelog.parents(n)[0], n)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	2718
1600 728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	2719 def unbundle(ui, repo, fname, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2720 """apply a changegroup file
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2721
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2722 Apply a compressed changegroup file generated by the bundle
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2723 command.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2724 """
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2725 f = urllib.urlopen(fname)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2726
1980 dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2727 header = f.read(6)
dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2728 if not header.startswith("HG"):
dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2729 raise util.Abort(_("%s: not a Mercurial bundle file") % fname)
dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2730 elif not header.startswith("HG10"):
dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2731 raise util.Abort(_("%s: unknown bundle version") % fname)
dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2732 elif header == "HG10BZ":
1940 7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2733 def generator(f):
7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2734 zd = bz2.BZ2Decompressor()
1980 dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2735 zd.decompress("BZ")
1940 7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2736 for chunk in f:
7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2737 yield zd.decompress(chunk)
1980 dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2738 elif header == "HG10UN":
1940 7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2739 def generator(f):
7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2740 for chunk in f:
7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2741 yield chunk
7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2742 else:
1980 dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2743 raise util.Abort(_("%s: unknown bundle compression type")
dfb796786337 use HG10UN header for uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1979 diff changeset	2744 % fname)
1940 7ae177a70f54 add a new bundle type: uncompressed bundle Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1920 diff changeset	2745 gen = generator(util.filechunkiter(f, 4096))
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2746 modheads = repo.addchangegroup(util.chunkbuffer(gen))
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2747 return postincoming(ui, repo, modheads, opts['update'])
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2748
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2749 def undo(ui, repo):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2750 """undo the last commit or pull
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2751
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2752 Roll back the last pull or commit transaction on the
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2753 repository, restoring the project to its earlier state.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2754
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2755 This command should be used with care. There is only one level of
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2756 undo and there is no redo.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2757
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2758 This command is not intended for use on public repositories. Once
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2759 a change is visible for pull by other users, undoing it locally is
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2760 ineffective.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2761 """
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	2762 repo.undo()
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	2763
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2764 def update(ui, repo, node=None, merge=False, clean=False, force=None,
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2765 branch=None, **opts):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2766 """update or merge working directory
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2767
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2768 Update the working directory to the specified revision.
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2769
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2770 If there are no outstanding changes in the working directory and
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2771 there is a linear relationship between the current version and the
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2772 requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2773
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2774 Otherwise the result is a merge between the contents of the
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2775 current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2776 changed between either parent are marked as changed for the next
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2777 commit and a commit must be performed before any further updates
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2778 are allowed.
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2779
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2780 By default, update will refuse to run if doing so would require
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2781 merging or discarding local changes.
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2782 """
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2783 if branch:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2784 br = repo.branchlookup(branch=branch)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2785 found = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2786 for x in br:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2787 if branch in br[x]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2788 found.append(x)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2789 if len(found) > 1:
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	2790 ui.warn(_("Found multiple heads for %s\n") % branch)
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2791 for x in found:
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2792 show_changeset(ui, repo, opts).show(changenode=x, brinfo=br)
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2793 return 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2794 if len(found) == 1:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2795 node = found[0]
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	2796 ui.warn(_("Using head %s for branch %s\n") % (short(node), branch))
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2797 else:
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	2798 ui.warn(_("branch %s not found\n") % (branch))
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2799 return 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2800 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	2801 node = node and repo.lookup(node) or repo.changelog.tip()
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	2802 return repo.update(node, allow=merge, force=clean, forcemerge=force)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	2803
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	2804 def verify(ui, repo):
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2805 """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	2806
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2807 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	2808
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2809 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	2810 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	2811 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	2812 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	2813 """
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	2814 return repo.verify()
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	2815
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2816 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	2817
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2818 table = {
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2819 "^add":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2820 (add,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2821 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2822 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2823 _('hg add [OPTION]... [FILE]...')),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2824 "addremove":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2825 (addremove,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2826 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2827 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2828 _('hg addremove [OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2829 "^annotate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2830 (annotate,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2831 [('r', 'rev', '', _('annotate the specified revision')),
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	2832 ('a', 'text', None, _('treat all files as text')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2833 ('u', 'user', None, _('list the author')),
1522 d07d729ce306 Added --date option to annotate. lupus@debian.org parents: 1519 diff changeset	2834 ('d', 'date', None, _('list the date')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2835 ('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	2836 ('c', 'changeset', None, _('list the changeset')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2837 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2838 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2839 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2840 "bundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	2841 (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	2842 [('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	2843 _('run even when remote repository is unrelated'))],
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	2844 _('hg bundle FILE DEST')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2845 "cat":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2846 (cat,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2847 [('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	2848 ('r', 'rev', '', _('print the given revision')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2849 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2850 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
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	2851 _('hg cat [OPTION]... FILE...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2852 "^clone":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2853 (clone,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2854 [('U', 'noupdate', None, _('do not update the new working directory')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2855 ('r', 'rev', [],
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2856 _('a changeset you would like to have after cloning')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2857 ('', 'pull', None, _('use pull protocol to copy metadata')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2858 ('e', 'ssh', '', _('specify ssh command to use')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2859 ('', 'remotecmd', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2860 _('specify hg command to run on the remote side'))],
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	2861 _('hg clone [OPTION]... SOURCE [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2862 "^commit\|ci":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2863 (commit,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2864 [('A', 'addremove', None, _('run addremove during commit')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2865 ('m', 'message', '', _('use <text> as commit message')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2866 ('l', 'logfile', '', _('read the commit message from <file>')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2867 ('d', 'date', '', _('record datecode as commit date')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2868 ('u', 'user', '', _('record user as commiter')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2869 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2870 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
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	2871 _('hg commit [OPTION]... [FILE]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2872 "copy\|cp":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2873 (copy,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2874 [('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	2875 ('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	2876 _('forcibly copy over an existing managed file')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2877 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2878 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2879 _('hg copy [OPTION]... [SOURCE]... DEST')),
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	2880 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
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	2881 "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	2882 (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	2883 [('o', 'options', None, _('show the command 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	2884 _('debugcomplete [-o] CMD')),
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	2885 "debugrebuildstate":
a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	2886 (debugrebuildstate,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2887 [('r', 'rev', '', _('revision to rebuild to'))],
1755 a8f7791e3680 add 'debugrebuildstate' to rebuild the dirstate from a given revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1754 diff changeset	2888 _('debugrebuildstate [-r REV] [REV]')),
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	2889 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
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	2890 "debugconfig": (debugconfig, [], _('debugconfig')),
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	2891 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
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	2892 "debugstate": (debugstate, [], _('debugstate')),
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	2893 "debugdata": (debugdata, [], _('debugdata FILE REV')),
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	2894 "debugindex": (debugindex, [], _('debugindex FILE')),
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	2895 "debugindexdot": (debugindexdot, [], _('debugindexdot FILE')),
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	2896 "debugrename": (debugrename, [], _('debugrename FILE [REV]')),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2897 "debugwalk":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2898 (debugwalk,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2899 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2900 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
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	2901 _('debugwalk [OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2902 "^diff":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2903 (diff,
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	2904 [('r', 'rev', [], _('revision')),
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	2905 ('a', 'text', None, _('treat all files as text')),
1728 9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	2906 ('p', 'show-function', None,
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	2907 _('show which function each change is in')),
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	2908 ('w', 'ignore-all-space', None,
9b92b71d5dd7 add -w and -p options to diff. this is for issue 126. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1720 diff changeset	2909 _('ignore white space when comparing lines')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2910 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2911 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
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	2912 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2913 "^export":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2914 (export,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2915 [('o', 'output', '', _('print output to file with formatted name')),
1571 bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	2916 ('a', 'text', None, _('treat all files as text')),
bcdc030c59f8 add a --switch-parent option to export against the other parent Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1570 diff changeset	2917 ('', 'switch-parent', None, _('diff against the second parent'))],
1812 a81f99dfaa2a fix the synopsis of some commands, mark rawcommit as deprecated in short help Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1811 diff changeset	2918 _('hg export [-a] [-o OUTFILESPEC] REV...')),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2919 "forget":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	2920 (forget,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2921 [('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2922 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2923 _('hg forget [OPTION]... FILE...')),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2924 "grep":
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2925 (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	2926 [('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	2927 ('', 'all', None, _('print all revisions that match')),
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	2928 ('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	2929 ('l', 'files-with-matches', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2930 _('print only filenames and revs that match')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2931 ('n', 'line-number', None, _('print matching line numbers')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2932 ('r', 'rev', [], _('search in given revision range')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2933 ('u', 'user', None, _('print user who committed change')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2934 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2935 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2936 _('hg grep [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	2937 "heads":
65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	2938 (heads,
1763 fa34a74efc40 Make option --branch vs. --branches more consistent. Thomas Arendsen Hein <thomas@intevation.de> parents: 1762 diff changeset	2939 [('b', 'branches', None, _('show branches')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	2940 ('', 'style', '', _('display using template map file')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2941 ('r', 'rev', '', _('show only heads which are descendants of rev')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	2942 ('', 'template', '', _('display with template'))],
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	2943 _('hg heads [-b] [-r <rev>]')),
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	2944 "help": (help_, [], _('hg help [COMMAND]')),
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	2945 "identify\|id": (identify, [], _('hg identify')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2946 "import\|patch":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2947 (import_,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2948 [('p', 'strip', 1,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2949 _('directory strip option for patch. This has the same\n') +
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2950 _('meaning as the corresponding patch option')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2951 ('b', 'base', '', _('base path')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2952 ('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	2953 _('skip check for outstanding uncommitted changes'))],
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2954 _('hg import [-p NUM] [-b BASE] [-f] PATCH...')),
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	2955 "incoming\|in": (incoming,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2956 [('M', 'no-merges', None, _('do not show merges')),
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	2957 ('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	2958 _('run even when remote repository is unrelated')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	2959 ('', 'style', '', _('display using template map file')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	2960 ('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	2961 ('', 'bundle', '', _('file to store the bundles into')),
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	2962 ('p', 'patch', None, _('show patch')),
1965 62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2963 ('', 'template', '', _('display with template')),
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2964 ('e', 'ssh', '', _('specify ssh command to use')),
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2965 ('', 'remotecmd', '',
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	2966 _('specify hg command to run on the remote side'))],
1944 fdf40c9b3306 incoming: add support for remote repo using bundlerepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1943 diff changeset	2967 _('hg incoming [-p] [-n] [-M] [--bundle FILENAME] [SOURCE]')),
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	2968 "^init": (init, [], _('hg init [DEST]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2969 "locate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2970 (locate,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2971 [('r', 'rev', '', _('search the repository as it stood at rev')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2972 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2973 _('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	2974 ('f', 'fullpath', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	2975 _('print complete paths from the filesystem root')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2976 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2977 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
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	2978 _('hg locate [OPTION]... [PATTERN]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2979 "^log\|history":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	2980 (log,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2981 [('b', 'branches', None, _('show branches')),
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	2982 ('k', 'keyword', [], _('search for a keyword')),
1756 f29857aaa053 add -l,--limit to log command. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1747 diff changeset	2983 ('l', 'limit', '', _('limit number of changes displayed')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	2984 ('r', 'rev', [], _('show the specified revision or range')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2985 ('M', 'no-merges', None, _('do not show merges')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	2986 ('', 'style', '', _('display using template map file')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	2987 ('m', 'only-merges', None, _('show only merges')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2988 ('p', 'patch', None, _('show patch')),
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1917 1894 diff changeset	2989 ('', 'template', '', _('display with template')),
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2990 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2991 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	2992 _('hg log [OPTION]... [FILE]')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	2993 "manifest": (manifest, [], _('hg manifest [REV]')),
2019 ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2994 "merge":
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2995 (merge,
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2996 [('b', 'branch', '', _('merge with head of a specific branch')),
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2997 ('', 'style', '', _('display using template map file')),
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2998 ('f', 'force', None, _('force a merge with outstanding changes')),
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	2999 ('', 'template', '', _('display with template'))],
ced2d3620f95 add merge command. means same thing as "update -m". Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3000 _('hg merge [-b TAG] [-f] [REV]')),
1253 a45e717c61a8 Add rename/mv command. Bryan O'Sullivan <bos@serpentine.com> parents: 1250 diff changeset	3001 "outgoing\|out": (outgoing,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3002 [('M', 'no-merges', None, _('do not show merges')),
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	3003 ('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	3004 _('run even when remote repository is unrelated')),
1439 65cbe22b03fa allow 'hg out' / 'hg in' to show newest commit first Michal Kvasnica <kvasnica@gmail.com> parents: 1437 diff changeset	3005 ('p', 'patch', None, _('show patch')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3006 ('', 'style', '', _('display using template map file')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	3007 ('n', 'newest-first', None, _('show newest record first')),
1965 62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	3008 ('', 'template', '', _('display with template')),
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	3009 ('e', 'ssh', '', _('specify ssh command to use')),
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	3010 ('', 'remotecmd', '',
62aa1b90414f add remotecmd/ssh option support to incoming/outgoing Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1959 diff changeset	3011 _('specify hg command to run on the remote side'))],
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3012 _('hg outgoing [-M] [-p] [-n] [DEST]')),
1724 5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	3013 "^parents":
5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	3014 (parents,
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	3015 [('b', 'branches', None, _('show branches')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3016 ('', 'style', '', _('display using template map file')),
74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3017 ('', 'template', '', _('display with template'))],
1724 5a36609f73a7 add a -b/--branch option to 'hg parents' Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1720 diff changeset	3018 _('hg parents [-b] [REV]')),
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	3019 "paths": (paths, [], _('hg paths [NAME]')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3020 "^pull":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3021 (pull,
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3022 [('u', 'update', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3023 _('update the working directory to tip after pull')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3024 ('e', 'ssh', '', _('specify ssh command to use')),
1959 d53a18f592be add -f/--force to pull, incoming, outgoing, to work on unrelated repo. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1948 diff changeset	3025 ('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	3026 _('run even when remote repository is unrelated')),
1469 0847c45ffee6 Merge bundle -r work from Eric Hopper Matt Mackall <mpm@selenic.com> parents: 1456 1467 diff changeset	3027 ('r', 'rev', [], _('a specific revision you would like to pull')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3028 ('', 'remotecmd', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3029 _('specify hg command to run on the remote side'))],
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3030 _('hg pull [-u] [-e FILE] [-r REV]... [--remotecmd FILE] [SOURCE]')),
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	3031 "^push":
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	3032 (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	3033 [('f', 'force', None, _('force push')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3034 ('e', 'ssh', '', _('specify ssh command to use')),
1781 284fc722c342 add an optional argument to push only the specified revisions (push -r) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1712 diff changeset	3035 ('r', 'rev', [], _('a specific revision you would like to push')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3036 ('', 'remotecmd', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3037 _('specify hg command to run on the remote side'))],
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3038 _('hg push [-f] [-e FILE] [-r REV]... [--remotecmd FILE] [DEST]')),
1818 9bbc7b304c34 Make the deprecated rawcommit an alias of debugrawcommit. Thomas Arendsen Hein <thomas@intevation.de> parents: 1816 diff changeset	3039 "debugrawcommit\|rawcommit":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3040 (rawcommit,
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	3041 [('p', 'parent', [], _('parent')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3042 ('d', 'date', '', _('date code')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3043 ('u', 'user', '', _('user')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3044 ('F', 'files', '', _('file list')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3045 ('m', 'message', '', _('commit message')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3046 ('l', 'logfile', '', _('commit message file'))],
1818 9bbc7b304c34 Make the deprecated rawcommit an alias of debugrawcommit. Thomas Arendsen Hein <thomas@intevation.de> parents: 1816 diff changeset	3047 _('hg debugrawcommit [OPTION]... [FILE]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3048 "recover": (recover, [], _('hg recover')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3049 "^remove\|rm":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3050 (remove,
1869 42c76ec7a8d4 Reordered options for remove, fixed synopsis for rename. Thomas Arendsen Hein <thomas@intevation.de> parents: 1867 diff changeset	3051 [('f', 'force', None, _('remove file even if modified')),
42c76ec7a8d4 Reordered options for remove, fixed synopsis for rename. Thomas Arendsen Hein <thomas@intevation.de> parents: 1867 diff changeset	3052 ('I', 'include', [], _('include names matching the given patterns')),
42c76ec7a8d4 Reordered options for remove, fixed synopsis for rename. Thomas Arendsen Hein <thomas@intevation.de> parents: 1867 diff changeset	3053 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3054 _('hg remove [OPTION]... FILE...')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3055 "rename\|mv":
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3056 (rename,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3057 [('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	3058 ('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	3059 _('forcibly copy over an existing managed file')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3060 ('I', 'include', [], _('include names matching the given patterns')),
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3061 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1869 42c76ec7a8d4 Reordered options for remove, fixed synopsis for rename. Thomas Arendsen Hein <thomas@intevation.de> parents: 1867 diff changeset	3062 _('hg rename [OPTION]... SOURCE... DEST')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3063 "^revert":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3064 (revert,
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3065 [('r', 'rev', '', _('revision to revert to')),
2029 d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3066 ('', 'no-backup', None, _('do not save backup copies of files')),
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3067 ('I', 'include', [], _('include names matching given patterns')),
d436b21b20dc rewrite revert command. fix issues 93, 123, 147. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2022 diff changeset	3068 ('X', 'exclude', [], _('exclude names matching given patterns'))],
1816 08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert. Thomas Arendsen Hein <thomas@intevation.de> parents: 1812 diff changeset	3069 _('hg revert [-r REV] [NAME]...')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3070 "root": (root, [], _('hg root')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3071 "^serve":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3072 (serve,
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3073 [('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	3074 ('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	3075 ('', '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	3076 ('E', 'errorlog', '', _('name of error log file to write to')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3077 ('p', 'port', 0, _('port to use (default: 8000)')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3078 ('a', 'address', '', _('address to use')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3079 ('n', 'name', '',
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3080 _('name to show in web pages (default: working dir)')),
1740 f95654385065 add --daemon option to serve command. for issue 45. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	3081 ('', '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	3082 ('', '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	3083 ('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	3084 ('', 'style', '', _('template style to use')),
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	3085 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3086 _('hg serve [OPTION]...')),
1507 cd8fadd8c689 Add explicit 'st' alias for status Matt Mackall <mpm@selenic.com> parents: 1506 diff changeset	3087 "^status\|st":
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	3088 (status,
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	3089 [('m', 'modified', None, _('show only modified 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	3090 ('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	3091 ('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	3092 ('d', 'deleted', None, _('show only deleted (but tracked) 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	3093 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
2022 a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files. Thomas Arendsen Hein <thomas@intevation.de> parents: 2020 diff changeset	3094 ('i', 'ignored', None, _('show 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	3095 ('n', 'no-status', None, _('hide status prefix')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3096 ('0', 'print0', None,
fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3097 _('end filenames with NUL, for use with xargs')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3098 ('I', 'include', [], _('include names matching the given patterns')),
ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3099 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3100 _('hg status [OPTION]... [FILE]...')),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3101 "tag":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3102 (tag,
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	3103 [('l', 'local', None, _('make the tag local')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3104 ('m', 'message', '', _('message for tag commit log entry')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3105 ('d', 'date', '', _('record datecode as commit date')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3106 ('u', 'user', '', _('record user as commiter')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3107 ('r', 'rev', '', _('revision to tag'))],
1812 a81f99dfaa2a fix the synopsis of some commands, mark rawcommit as deprecated in short help Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1811 diff changeset	3108 _('hg tag [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME')),
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	3109 "tags": (tags, [], _('hg 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	3110 "tip":
8eaa8e06a364 Add option -b/--branch to hg tip (as done for hg parents). Thomas Arendsen Hein <thomas@intevation.de> parents: 1761 diff changeset	3111 (tip,
1763 fa34a74efc40 Make option --branch vs. --branches more consistent. Thomas Arendsen Hein <thomas@intevation.de> parents: 1762 diff changeset	3112 [('b', 'branches', None, _('show branches')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3113 ('', 'style', '', _('display using template map file')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	3114 ('p', 'patch', None, _('show patch')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3115 ('', 'template', '', _('display with template'))],
1811 6cb548cffdf5 resync commands.py docstrings with hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1804 diff changeset	3116 _('hg tip [-b] [-p]')),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3117 "unbundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	3118 (unbundle,
1601 a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	3119 [('u', 'update', None,
a1b25fb2e764 Error handling for unbundle, fix option line wrapping Matt Mackall <mpm@selenic.com> parents: 1600 diff changeset	3120 _('update the working directory to tip after unbundle'))],
1600 728fd9584993 add --update support to 'hg unbundle' Muli Ben-Yehuda <mulix@mulix.org> parents: 1596 diff changeset	3121 _('hg unbundle [-u] FILE')),
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	3122 "undo": (undo, [], _('hg undo')),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	3123 "^update\|up\|checkout\|co":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3124 (update,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3125 [('b', 'branch', '', _('checkout the head of a specific branch')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3126 ('', 'style', '', _('display using template map file')),
1437 ea51d296085f import docstring from doc/hg.1.txt Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1436 diff changeset	3127 ('m', 'merge', None, _('allow merging of branches')),
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	3128 ('C', 'clean', None, _('overwrite locally modified files')),
1907 7718885070b1 let commands that show changesets use templates. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1800 diff changeset	3129 ('f', 'force', None, _('force a merge with outstanding changes')),
1913 74cf2b2f43d4 fix some things people wanted to be cleaner. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1910 diff changeset	3130 ('', 'template', '', _('display with template'))],
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1571 diff changeset	3131 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')),
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	3132 "verify": (verify, [], _('hg verify')),
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	3133 "version": (show_version, [], _('hg version')),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	3134 }
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3135
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	3136 globalopts = [
1894 4c53aaf2d153 Allow symbolic path names in global -R/--repository parameter. Thomas Arendsen Hein <thomas@intevation.de> parents: 1893 diff changeset	3137 ('R', 'repository', '',
4c53aaf2d153 Allow symbolic path names in global -R/--repository parameter. Thomas Arendsen Hein <thomas@intevation.de> parents: 1893 diff changeset	3138 _('repository root directory or symbolic path name')),
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3139 ('', 'cwd', '', _('change working directory')),
1602 fb4149eebdd4 strictly adher to 80 chars per line Muli Ben-Yehuda <mulix@mulix.org> parents: 1601 diff changeset	3140 ('y', 'noninteractive', None,
1615 83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3141 _('do not prompt, assume \'yes\' for any required answers')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3142 ('q', 'quiet', None, _('suppress output')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3143 ('v', 'verbose', None, _('enable additional output')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3144 ('', 'debug', None, _('enable debugging output')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3145 ('', 'debugger', None, _('start debugger')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3146 ('', 'traceback', None, _('print traceback on exception')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3147 ('', 'time', None, _('time how long the command takes')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3148 ('', 'profile', None, _('print command execution profile')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3149 ('', 'version', None, _('output version information and exit')),
83238c1db6de Cleanup of indentation, spacing, newlines, strings and line length Thomas Arendsen Hein <thomas@intevation.de> parents: 1607 diff changeset	3150 ('h', 'help', None, _('display help and exit')),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	3151 ]
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3152
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3153 norepo = ("clone init version help debugancestor debugcomplete debugdata"
1858 9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3154 " debugindex debugindexdot")
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3155 optionalrepo = ("paths debugconfig")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3156
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3157 def findpossible(cmd):
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3158 """
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3159 Return cmd -> (aliases, command table entry)
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3160 for each matching command
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3161 """
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3162 choice = {}
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3163 debugchoice = {}
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3164 for e in table.keys():
1506 11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	3165 aliases = e.lstrip("^").split("\|")
11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	3166 if cmd in aliases:
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3167 choice[cmd] = (aliases, table[e])
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3168 continue
1506 11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	3169 for a in aliases:
11c8b81f95fe if unambigious command name are passed, use them Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1505 diff changeset	3170 if a.startswith(cmd):
1850 05f6c0d1bad8 Hide debug commands in ambiguous command list, unless no normal command matches. Thomas Arendsen Hein <thomas@intevation.de> parents: 1849 diff changeset	3171 if aliases[0].startswith("debug"):
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3172 debugchoice[a] = (aliases, table[e])
1850 05f6c0d1bad8 Hide debug commands in ambiguous command list, unless no normal command matches. Thomas Arendsen Hein <thomas@intevation.de> parents: 1849 diff changeset	3173 else:
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3174 choice[a] = (aliases, table[e])
1739 57de7e1a81d2 AmbiguousCommand is raised too soon. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1736 diff changeset	3175 break
57de7e1a81d2 AmbiguousCommand is raised too soon. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1736 diff changeset	3176
1850 05f6c0d1bad8 Hide debug commands in ambiguous command list, unless no normal command matches. Thomas Arendsen Hein <thomas@intevation.de> parents: 1849 diff changeset	3177 if not choice and debugchoice:
05f6c0d1bad8 Hide debug commands in ambiguous command list, unless no normal command matches. Thomas Arendsen Hein <thomas@intevation.de> parents: 1849 diff changeset	3178 choice = debugchoice
05f6c0d1bad8 Hide debug commands in ambiguous command list, unless no normal command matches. Thomas Arendsen Hein <thomas@intevation.de> parents: 1849 diff changeset	3179
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3180 return choice
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3181
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3182 def find(cmd):
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3183 """Return (aliases, command table entry) for command string."""
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3184 choice = findpossible(cmd)
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3185
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3186 if choice.has_key(cmd):
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3187 return choice[cmd]
913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3188
1848 bb70ffebe77b show choices on ambiguous commands TK Soh <teekaysoh@yahoo.com> parents: 1840 diff changeset	3189 if len(choice) > 1:
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3190 clist = choice.keys()
1849 360d0f8d9d6f Show ambiguous aliases, if they are not simple abbreviations. Sort output. Thomas Arendsen Hein <thomas@intevation.de> parents: 1848 diff changeset	3191 clist.sort()
1848 bb70ffebe77b show choices on ambiguous commands TK Soh <teekaysoh@yahoo.com> parents: 1840 diff changeset	3192 raise AmbiguousCommand(cmd, clist)
1739 57de7e1a81d2 AmbiguousCommand is raised too soon. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 1736 diff changeset	3193
1517 b582dbc16165 Canonicalize command when using aliases or prefix matching. Thomas Arendsen Hein <thomas@intevation.de> parents: 1507 diff changeset	3194 if choice:
1887 913397c27cd8 new command debugcomplete Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1875 diff changeset	3195 return choice.values()[0]
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3196
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3197 raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3198
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3199 class SignalInterrupt(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3200 """Exception raised on SIGTERM and SIGHUP."""
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	3201
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	3202 def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	3203 raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	3204
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	3205 def run():
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	3206 sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	3207
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3208 class ParseError(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3209 """Exception raised on errors in parsing the command line."""
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3210
1453 6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	3211 def parse(ui, args):
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3212 options = {}
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3213 cmdoptions = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3214
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3215 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3216 args = fancyopts.fancyopts(args, globalopts, options)
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3217 except fancyopts.getopt.GetoptError, inst:
618 4051b78c53c7 Handle unrecognised options correctly. Bryan O'Sullivan <bos@serpentine.com> parents: 617 diff changeset	3218 raise ParseError(None, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3219
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3220 if args:
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3221 cmd, args = args[0], args[1:]
1567 b4956bbbadc9 make command defaults works for aliases TK Soh <teekaysoh@yahoo.com> parents: 1565 diff changeset	3222 aliases, i = find(cmd)
b4956bbbadc9 make command defaults works for aliases TK Soh <teekaysoh@yahoo.com> parents: 1565 diff changeset	3223 cmd = aliases[0]
1453 6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	3224 defaults = ui.config("defaults", cmd)
6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	3225 if defaults:
1526 c230939283c3 fix a bug where command defaults suppress global options TK Soh <teekaysoh@yahoo.com> parents: 1525 diff changeset	3226 args = defaults.split() + args
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3227 c = list(i[1])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3228 else:
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3229 cmd = None
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3230 c = []
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3231
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3232 # combine global options into local
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3233 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3234 c.append((o[0], o[1], options[o[1]], o[3]))
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	3235
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	3236 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3237 args = fancyopts.fancyopts(args, c, cmdoptions)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	3238 except fancyopts.getopt.GetoptError, inst:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3239 raise ParseError(cmd, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3240
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3241 # separate global options back out
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3242 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3243 n = o[1]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3244 options[n] = cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3245 del cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	3246
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3247 return (cmd, cmd and i[0] or None, args, options, cmdoptions)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3248
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3249 def dispatch(args):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3250 signal.signal(signal.SIGTERM, catchterm)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3251 try:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3252 signal.signal(signal.SIGHUP, catchterm)
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3253 except AttributeError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3254 pass
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3255
1483 a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	3256 try:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	3257 u = ui.ui()
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	3258 except util.Abort, inst:
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	3259 sys.stderr.write(_("abort: %s\n") % inst)
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	3260 sys.exit(1)
a4ba63e04134 Fix traceback on bad system hgrc files Soh Tk-r28629 <tksoh@freescale.com> parents: 1475 diff changeset	3261
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3262 external = []
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3263 for x in u.extensions():
1545 d69070c2547a fix errors found by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1543 diff changeset	3264 def on_exception(exc, inst):
1424 918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3265 u.warn(_("*** failed to import extension %s\n") % x[1])
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3266 u.warn("%s\n" % inst)
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3267 if "--traceback" in sys.argv[1:]:
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3268 traceback.print_exc()
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3269 if x[1]:
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	3270 try:
5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	3271 mod = imp.load_source(x[0], x[1])
1424 918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3272 except Exception, inst:
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3273 on_exception(Exception, inst)
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	3274 continue
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3275 else:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3276 def importh(name):
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3277 mod = __import__(name)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3278 components = name.split('.')
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3279 for comp in components[1:]:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3280 mod = getattr(mod, comp)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3281 return mod
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	3282 try:
1889 468730910353 Try to import extensions from the hgext module first. Thomas Arendsen Hein <thomas@intevation.de> parents: 1887 diff changeset	3283 try:
468730910353 Try to import extensions from the hgext module first. Thomas Arendsen Hein <thomas@intevation.de> parents: 1887 diff changeset	3284 mod = importh("hgext." + x[0])
468730910353 Try to import extensions from the hgext module first. Thomas Arendsen Hein <thomas@intevation.de> parents: 1887 diff changeset	3285 except ImportError:
468730910353 Try to import extensions from the hgext module first. Thomas Arendsen Hein <thomas@intevation.de> parents: 1887 diff changeset	3286 mod = importh(x[0])
1424 918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3287 except Exception, inst:
918cb47d725e [issue21] cannot debug extension Benoit Boissinot <mercurial-bugs@selenic.com> parents: 1420 diff changeset	3288 on_exception(Exception, inst)
1342 5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	3289 continue
5a42da1db402 Warn on failure to import an extension mpm@selenic.com parents: 1337 diff changeset	3290
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3291 external.append(mod)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3292 for x in external:
1295 abcdf14449ea Make contract with extensions optional. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	3293 cmdtable = getattr(x, 'cmdtable', {})
abcdf14449ea Make contract with extensions optional. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	3294 for t in cmdtable:
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3295 if t in table:
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	3296 u.warn(_("module %s overrides %s\n") % (x.__name__, t))
1295 abcdf14449ea Make contract with extensions optional. Bryan O'Sullivan <bos@serpentine.com> parents: 1285 diff changeset	3297 table.update(cmdtable)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	3298
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3299 try:
1453 6fbb13b7a59f get command defaults from hgrc TK Soh <teekaysoh@yahoo.com> parents: 1447 diff changeset	3300 cmd, func, args, options, cmdoptions = parse(u, args)
1875 2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3301 if options["time"]:
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3302 def get_times():
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3303 t = os.times()
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3304 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3305 t = (t[0], t[1], t[2], t[3], time.clock())
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3306 return t
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3307 s = get_times()
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3308 def print_time():
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3309 t = get_times()
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3310 u.warn(_("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n") %
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3311 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3312 atexit.register(print_time)
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3313
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3314 u.updateopts(options["verbose"], options["debug"], options["quiet"],
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3315 not options["noninteractive"])
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3316
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3317 # enter the debugger before command execution
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3318 if options['debugger']:
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3319 pdb.set_trace()
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3320
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3321 try:
1859 39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3322 if options['cwd']:
39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3323 try:
39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3324 os.chdir(options['cwd'])
39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3325 except OSError, inst:
39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3326 raise util.Abort('%s: %s' %
39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3327 (options['cwd'], inst.strerror))
39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3328
1894 4c53aaf2d153 Allow symbolic path names in global -R/--repository parameter. Thomas Arendsen Hein <thomas@intevation.de> parents: 1893 diff changeset	3329 path = u.expandpath(options["repository"]) or ""
1859 39c46510ed25 Moved --cwd handling in front of -R handling again. Shorter code for initial -R. Thomas Arendsen Hein <thomas@intevation.de> parents: 1858 diff changeset	3330 repo = path and hg.repository(u, path=path) or None
1857 848152a2e67f Always try to open the repository if -R/--repository is specified. Thomas Arendsen Hein <thomas@intevation.de> parents: 1851 diff changeset	3331
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	3332 if options['help']:
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	3333 help_(u, cmd, options['version'])
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	3334 sys.exit(0)
7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	3335 elif options['version']:
1047 a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3336 show_version(u)
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3337 sys.exit(0)
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3338 elif not cmd:
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3339 help_(u, 'shortlist')
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3340 sys.exit(0)
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	3341
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3342 if cmd not in norepo.split():
1858 9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3343 try:
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3344 if not repo:
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3345 repo = hg.repository(u, path=path)
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3346 u = repo.ui
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3347 for x in external:
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3348 if hasattr(x, 'reposetup'):
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3349 x.reposetup(u, repo)
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3350 except hg.RepoError:
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3351 if cmd not in optionalrepo.split():
9fab6e903bae Make hg paths and hg debugconfig work with -R/--repository option. Thomas Arendsen Hein <thomas@intevation.de> parents: 1857 diff changeset	3352 raise
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3353 d = lambda: func(u, repo, args, *cmdoptions)
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3354 else:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	3355 d = lambda: func(u, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3356
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3357 try:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3358 if options['profile']:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3359 import hotshot, hotshot.stats
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3360 prof = hotshot.Profile("hg.prof")
1832 7a58bf789965 generate profile even when exception raised. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1823 diff changeset	3361 try:
7a58bf789965 generate profile even when exception raised. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1823 diff changeset	3362 try:
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3363 return prof.runcall(d)
1832 7a58bf789965 generate profile even when exception raised. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1823 diff changeset	3364 except:
1837 6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3365 try:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3366 u.warn(_('exception raised - generating '
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3367 'profile anyway\n'))
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3368 except:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3369 pass
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3370 raise
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3371 finally:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3372 prof.close()
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3373 stats = hotshot.stats.load("hg.prof")
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3374 stats.strip_dirs()
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3375 stats.sort_stats('time', 'calls')
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3376 stats.print_stats(40)
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3377 else:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3378 return d()
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3379 finally:
6f67a4c93493 make ui flush output. this makes error happen if printing to /dev/full. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1835 diff changeset	3380 u.flush()
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3381 except:
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	3382 # enter the debugger when we hit an exception
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	3383 if options['debugger']:
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	3384 pdb.post_mortem(sys.exc_info()[2])
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3385 if options['traceback']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3386 traceback.print_exc()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	3387 raise
1875 2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3388 except ParseError, inst:
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3389 if inst.args[0]:
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3390 u.warn(_("hg %s: %s\n") % (inst.args[0], inst.args[1]))
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3391 help_(u, inst.args[0])
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3392 else:
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3393 u.warn(_("hg: %s\n") % inst.args[1])
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3394 help_(u, 'shortlist')
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3395 sys.exit(-1)
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3396 except AmbiguousCommand, inst:
1920 b7cc0f323a4c merge with crew. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1917 1894 diff changeset	3397 u.warn(_("hg: command '%s' is ambiguous:\n %s\n") %
1875 2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3398 (inst.args[0], " ".join(inst.args[1])))
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3399 sys.exit(1)
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3400 except UnknownCommand, inst:
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3401 u.warn(_("hg: unknown command '%s'\n") % inst.args[0])
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3402 help_(u, 'shortlist')
2f4a0734c100 Catch other exceptions (e.g. util.Abort) in parse(), too. Thomas Arendsen Hein <thomas@intevation.de> parents: 1869 diff changeset	3403 sys.exit(1)
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	3404 except hg.RepoError, inst:
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	3405 u.warn(_("abort: "), inst, "!\n")
2016 ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3406 except lock.LockHeld, inst:
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3407 if inst.errno == errno.ETIMEDOUT:
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3408 reason = _('timed out waiting for lock held by %s') % inst.locker
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3409 else:
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3410 reason = _('lock held by %s') % inst.locker
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3411 u.warn(_("abort: %s: %s\n") % (inst.desc or inst.filename, reason))
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3412 except lock.LockUnavailable, inst:
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3413 u.warn(_("abort: could not lock %s: %s\n") %
ff5c9a92f556 fix backtrace printed when cannot get lock. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1996 diff changeset	3414 (inst.desc or inst.filename, inst.strerror))
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1212 diff changeset	3415 except revlog.RevlogError, inst:
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	3416 u.warn(_("abort: "), inst, "!\n")
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	3417 except SignalInterrupt:
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	3418 u.warn(_("killed!\n"))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	3419 except KeyboardInterrupt:
832 b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	3420 try:
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	3421 u.warn(_("interrupted!\n"))
832 b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	3422 except IOError, inst:
b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	3423 if inst.errno == errno.EPIPE:
b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	3424 if u.debugflag:
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	3425 u.warn(_("\nbroken pipe\n"))
832 b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	3426 else:
b65773f7db41 Handle broken pipe on pressing Ctrl-C with e.g. 'hg log\|grep something'. Thomas Arendsen Hein <thomas@intevation.de> parents: 818 diff changeset	3427 raise
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	3428 except IOError, inst:
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	3429 if hasattr(inst, "code"):
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	3430 u.warn(_("abort: %s\n") % inst)
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	3431 elif hasattr(inst, "reason"):
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	3432 u.warn(_("abort: error: %s\n") % inst.reason[1])
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	3433 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	3434 if u.debugflag:
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	3435 u.warn(_("broken pipe\n"))
1350 3729e2773cca Fix pipe error regression Matt Mackall <mpm@selenic.com> parents: 1342 diff changeset	3436 elif getattr(inst, "strerror", None):
1354 8cf364c65425 Made the abort message for IOError nicer when the filename is known. Eric Hopper <hopper@omnifarious.org> parents: 1350 diff changeset	3437 if getattr(inst, "filename", None):
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	3438 u.warn(_("abort: %s - %s\n") % (inst.strerror, inst.filename))
1354 8cf364c65425 Made the abort message for IOError nicer when the filename is known. Eric Hopper <hopper@omnifarious.org> parents: 1350 diff changeset	3439 else:
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	3440 u.warn(_("abort: %s\n") % inst.strerror)
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	3441 else:
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	3442 raise
549 92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	3443 except OSError, inst:
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	3444 if hasattr(inst, "filename"):
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	3445 u.warn(_("abort: %s: %s\n") % (inst.strerror, inst.filename))
549 92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	3446 else:
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	3447 u.warn(_("abort: %s\n") % inst.strerror)
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	3448 except util.Abort, inst:
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	3449 u.warn(_('abort: '), inst.args[0] % inst.args[1:], '\n')
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	3450 sys.exit(1)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3451 except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3452 # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3453 tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3454 if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	3455 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	3456 u.debug(inst, "\n")
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	3457 u.warn(_("%s: invalid arguments\n") % cmd)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	3458 help_(u, cmd)
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	3459 except SystemExit:
1229 2eb1cd695dd2 Fix comment typo mpm@selenic.com parents: 1227 diff changeset	3460 # don't catch this in the catch-all below
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	3461 raise
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	3462 except:
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 u.warn(_("** unknown exception encountered, details follow\n"))
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	3464 u.warn(_("** report bug details to mercurial@selenic.com\n"))
1552 7509fa02437f Added version information to "report bug" message for unknown exceptions. Thomas Arendsen Hein <thomas@intevation.de> parents: 1551 diff changeset	3465 u.warn(_("** Mercurial Distributed SCM (version %s)\n")
7509fa02437f Added version information to "report bug" message for unknown exceptions. Thomas Arendsen Hein <thomas@intevation.de> parents: 1551 diff changeset	3466 % version.get_version())
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	3467 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	3468
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	3469 sys.exit(-1)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/commands.py @ 2072:74d3f5336b66