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

annotate mercurial/commands.py @ 1225:ea90162e210c

Add --debugger global option With this option, hg will drop into the Python debugger on execution. Running 'continue' will execute normally, and the debugger will be reinvoked if an exception is raised.

author	mpm@selenic.com
date	Thu, 08 Sep 2005 17:09:31 -0700
parents	a5cb17a2d240
children	e3ea354d99b2

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 *
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	10 demandload(globals(), "os re sys signal shutil imp urllib pdb")
1093 1f1661c58283 commands: use revlog directly for debug commands mpm@selenic.com parents: 1092 diff changeset	11 demandload(globals(), "fancyopts ui hg util lock revlog")
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	12 demandload(globals(), "fnmatch hgweb mdiff random signal time traceback")
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	13 demandload(globals(), "errno socket version struct atexit sets bz2")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	14
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	15 class UnknownCommand(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	16 """Exception raised if command is not in the command table."""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	17
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	18 def filterfiles(filters, files):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	19 l = [x for x in files if x in filters]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	20
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	21 for t in filters:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	22 if t and t[-1] != "/":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	23 t += "/"
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	24 l += [x for x in files if x.startswith(t)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	25 return l
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	26
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	27 def relpath(repo, args):
628 8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	28 cwd = repo.getcwd()
8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	29 if cwd:
886 509de8ab6f31 Fix walk path handling on Windows Bryan O'Sullivan <bos@serpentine.com> parents: 884 diff changeset	30 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	31 return args
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	32
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	33 def matchpats(repo, cwd, pats=[], opts={}, head=''):
1081 8b7d63489db3 Change canonpath to not know about repo objects mpm@selenic.com parents: 1071 diff changeset	34 return util.matcher(repo.root, cwd, pats or ['.'], opts.get('include'),
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	35 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	36
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	37 def makewalk(repo, pats, opts, 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	38 cwd = repo.getcwd()
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	39 files, matchfn, anypats = matchpats(repo, cwd, pats, opts, head)
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	40 exact = dict(zip(files, files))
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	41 def walk():
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	42 for src, fn in repo.walk(files=files, match=matchfn):
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	43 yield src, fn, util.pathto(cwd, fn), fn in exact
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	44 return files, matchfn, walk()
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	45
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	46 def walk(repo, pats, opts, head=''):
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	47 files, matchfn, results = makewalk(repo, pats, opts, head)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	48 for r in results:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	49 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	50
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	51 def walkchangerevs(ui, repo, cwd, pats, opts):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	52 '''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	53
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	54 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	55 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	56 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	57
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	58 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	59 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	60 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	61
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	62 This function returns an (iterator, getchange) pair. The
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	63 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	64 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	65 the following forms:
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 "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	68 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	69 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	70
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	71 "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	72 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	73 possible display
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	74
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	75 "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	76 over with "add" - use to display data'''
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	77 cwd = repo.getcwd()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	78 if not pats and cwd:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	79 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	80 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	81 files, matchfn, anypats = matchpats(repo, (pats and cwd) or '',
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	82 pats, opts)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	83 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	84 wanted = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	85 slowpath = anypats
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	86 window = 300
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	87 fncache = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	88
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	89 chcache = {}
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	90 def getchange(rev):
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	91 ch = chcache.get(rev)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	92 if ch is None:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	93 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	94 return ch
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	95
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	96 if not slowpath and not files:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	97 # No files, no patterns. Display all revs.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	98 wanted = dict(zip(revs, revs))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	99 if not slowpath:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	100 # Only files, no patterns. Check the history of each file.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	101 def filerevgen(filelog):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	102 for i in xrange(filelog.count() - 1, -1, -window):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	103 revs = []
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	104 for j in xrange(max(0, i - window), i + 1):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	105 revs.append(filelog.linkrev(filelog.node(j)))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	106 revs.reverse()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	107 for rev in revs:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	108 yield rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	109
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	110 minrev, maxrev = min(revs), max(revs)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	111 for file in files:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	112 filelog = repo.file(file)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	113 # 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	114 # try to find matching entries on the slow path.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	115 if filelog.count() == 0:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	116 slowpath = True
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	117 break
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	118 for rev in filerevgen(filelog):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	119 if rev <= maxrev:
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	120 if rev < minrev:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	121 break
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	122 fncache.setdefault(rev, [])
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	123 fncache[rev].append(file)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	124 wanted[rev] = 1
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	125 if slowpath:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	126 # The slow path checks files modified in every changeset.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	127 def changerevgen():
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	128 for i in xrange(repo.changelog.count() - 1, -1, -window):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	129 for j in xrange(max(0, 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	130 yield j, getchange(j)[3]
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	131
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	132 for rev, changefiles in changerevgen():
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	133 matches = filter(matchfn, changefiles)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	134 if matches:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	135 fncache[rev] = matches
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	136 wanted[rev] = 1
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	137
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	138 def iterate():
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	139 for i in xrange(0, len(revs), window):
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	140 yield 'window', revs[0] < revs[-1], revs[-1]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	141 nrevs = [rev for rev in revs[i:min(i+window, len(revs))]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	142 if rev in wanted]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	143 srevs = list(nrevs)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	144 srevs.sort()
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	145 for rev in srevs:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	146 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	147 yield 'add', rev, fns
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	148 for rev in nrevs:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	149 yield 'iter', rev, None
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	150 return iterate(), getchange
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	151
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	152 revrangesep = ':'
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	153
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	154 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	155 """Yield revision as strings from a list of revision specifications."""
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	156 if revlog is None:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	157 revlog = repo.changelog
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	158 revcount = revlog.count()
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	159 def fix(val, defval):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	160 if not val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	161 return defval
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	162 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	163 num = int(val)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	164 if str(num) != val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	165 raise ValueError
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	166 if num < 0:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	167 num += revcount
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	168 if not (0 <= num < revcount):
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	169 raise ValueError
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	170 except ValueError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	171 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	172 num = repo.changelog.rev(repo.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	173 except KeyError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	174 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	175 num = revlog.rev(revlog.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	176 except KeyError:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	177 raise util.Abort('invalid revision identifier %s', val)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	178 return num
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	179 seen = {}
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	180 for spec in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	181 if spec.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	182 start, end = spec.split(revrangesep, 1)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	183 start = fix(start, 0)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	184 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	185 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	186 for rev in xrange(start, end+step, step):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	187 if rev in seen: continue
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	188 seen[rev] = 1
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	189 yield str(rev)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	190 else:
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	191 rev = fix(spec, None)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	192 if rev in seen: continue
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	193 seen[rev] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	194 yield str(rev)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	195
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	196 def make_filename(repo, r, pat, node=None,
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	197 total=None, seqno=None, revwidth=None):
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	198 node_expander = {
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	199 'H': lambda: hex(node),
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	200 'R': lambda: str(r.rev(node)),
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	201 'h': lambda: short(node),
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	202 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	203 expander = {
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	204 '%': lambda: '%',
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	205 'b': lambda: os.path.basename(repo.root),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	206 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	207
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	208 try:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	209 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	210 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	211 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	212 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	213 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	214 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	215 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	216 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	217 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	218 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	219
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	220 newname = []
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	221 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	222 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	223 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	224 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	225 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	226 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	227 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	228 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	229 newname.append(c)
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	230 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	231 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	232 except KeyError, inst:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	233 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	234 inst.args[0])
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	235
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	236 def make_file(repo, r, pat, node=None,
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	237 total=None, seqno=None, revwidth=None, mode='wb'):
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	238 if not pat or pat == '-':
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	239 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	240 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	241 return pat
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	242 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	243 return pat
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	244 return open(make_filename(repo, r, pat, node, total, seqno, revwidth),
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	245 mode)
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	246
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	247 def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always,
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	248 changes=None, text=False):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	249 def date(c):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	250 return time.asctime(time.gmtime(float(c[2].split(' ')[0])))
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	251
904 969647d5100a Add optional parameter for changed/added/del/unknown files to commands.dodiff mason@suse.com parents: 899 diff changeset	252 if not changes:
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	253 (c, a, d, u) = repo.changes(node1, node2, files, match=match)
904 969647d5100a Add optional parameter for changed/added/del/unknown files to commands.dodiff mason@suse.com parents: 899 diff changeset	254 else:
969647d5100a Add optional parameter for changed/added/del/unknown files to commands.dodiff mason@suse.com parents: 899 diff changeset	255 (c, a, d, u) = changes
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	256 if files:
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	257 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d))
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	258
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	259 if not c and not a and not d:
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	260 return
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	261
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	262 if node2:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	263 change = repo.changelog.read(node2)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	264 mmap2 = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	265 date2 = date(change)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	266 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	267 return repo.file(f).read(mmap2[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	268 else:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	269 date2 = time.asctime()
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	270 if not node1:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	271 node1 = repo.dirstate.parents()[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	272 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	273 return repo.wfile(f).read()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	274
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	275 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	276 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	277 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	278 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	279 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	280
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	281 change = repo.changelog.read(node1)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	282 mmap = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	283 date1 = date(change)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	284
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	285 for f in c:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	286 to = None
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	287 if f in mmap:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	288 to = repo.file(f).read(mmap[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	289 tn = read(f)
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	290 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	291 for f in a:
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	292 to = None
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	293 tn = read(f)
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	294 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	295 for f in d:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	296 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	297 tn = None
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	298 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r, text=text))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	299
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	300 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	301 """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	302 user = revcache.get(rev)
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	303 if user is None:
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	304 user = revcache[rev] = ui.shortuser(name)
d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	305 return user
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	306
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	307 def show_changeset(ui, repo, rev=0, changenode=None, brinfo=None):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	308 """show a single changeset or file revision"""
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	309 log = repo.changelog
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	310 if changenode is None:
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	311 changenode = log.node(rev)
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	312 elif not rev:
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	313 rev = log.rev(changenode)
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	314
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	315 if ui.quiet:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	316 ui.write("%d:%s\n" % (rev, short(changenode)))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	317 return
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	318
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	319 changes = log.read(changenode)
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	320
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 966 diff changeset	321 t, tz = changes[2].split(' ')
973 a51991ebf229 Deal with non-integer date offsets generated by some tools mpm@selenic.com parents: 967 diff changeset	322 # a conversion tool was sticking non-integer offsets into repos
a51991ebf229 Deal with non-integer date offsets generated by some tools mpm@selenic.com parents: 967 diff changeset	323 try:
a51991ebf229 Deal with non-integer date offsets generated by some tools mpm@selenic.com parents: 967 diff changeset	324 tz = int(tz)
a51991ebf229 Deal with non-integer date offsets generated by some tools mpm@selenic.com parents: 967 diff changeset	325 except ValueError:
a51991ebf229 Deal with non-integer date offsets generated by some tools mpm@selenic.com parents: 967 diff changeset	326 tz = 0
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 966 diff changeset	327 date = time.asctime(time.localtime(float(t))) + " %+05d" % (int(tz)/-36)
1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 966 diff changeset	328
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	329 parents = [(log.rev(p), ui.verbose and hex(p) or short(p))
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	330 for p in log.parents(changenode)
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	331 if ui.debugflag or p != nullid]
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	332 if not ui.debugflag and len(parents) == 1 and parents[0][0] == rev-1:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	333 parents = []
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	334
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	335 if ui.verbose:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	336 ui.write("changeset: %d:%s\n" % (rev, hex(changenode)))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	337 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	338 ui.write("changeset: %d:%s\n" % (rev, short(changenode)))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	339
687 44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	340 for tag in repo.nodetags(changenode):
44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	341 ui.status("tag: %s\n" % tag)
44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	342 for parent in parents:
44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	343 ui.write("parent: %d:%s\n" % parent)
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	344
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	345 if brinfo and changenode in brinfo:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	346 br = brinfo[changenode]
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	347 ui.write("branch: %s\n" % " ".join(br))
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	348
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	349 ui.debug("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]),
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	350 hex(changes[0])))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	351 ui.status("user: %s\n" % changes[1])
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 966 diff changeset	352 ui.status("date: %s\n" % date)
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	353
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	354 if ui.debugflag:
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	355 files = repo.changes(log.parents(changenode)[0], changenode)
490 df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	356 for key, value in zip(["files:", "files+:", "files-:"], files):
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	357 if value:
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	358 ui.note("%-12s %s\n" % (key, " ".join(value)))
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	359 else:
30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	360 ui.note("files: %s\n" % " ".join(changes[3]))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	361
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	362 description = changes[4].strip()
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	363 if description:
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	364 if ui.verbose:
27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	365 ui.status("description:\n")
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	366 ui.status(description)
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 542 diff changeset	367 ui.status("\n\n")
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	368 else:
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	369 ui.status("summary: %s\n" % description.splitlines()[0])
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	370 ui.status("\n")
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	371
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	372 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	373 """output version and copyright information"""
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	374 ui.write("Mercurial Distributed SCM (version %s)\n"
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	375 % version.get_version())
423 25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	376 ui.status(
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	377 "\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	378 "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	379 "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	380 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	381 )
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	382
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	383 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	384 """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	385 option_lists = []
846 a30f7ee30914 When hg is invoked without parameters, the short list help is displayed. kreijack@inwind.REMOVEME.it parents: 845 diff changeset	386 if cmd and cmd != 'shortlist':
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	387 if with_version:
160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	388 show_version(ui)
160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	389 ui.write('\n')
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	390 key, i = find(cmd)
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	391 # synopsis
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	392 ui.write("%s\n\n" % i[2])
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	393
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	394 # description
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	395 doc = i[0].__doc__
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	396 if ui.quiet:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	397 doc = doc.splitlines(0)[0]
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	398 ui.write("%s\n" % doc.rstrip())
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	399
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	400 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	401 # aliases
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	402 aliases = ', '.join(key.split('\|')[1:])
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	403 if aliases:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	404 ui.write("\naliases: %s\n" % aliases)
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	405
1052 d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	406 # options
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	407 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	408 option_lists.append(("options", i[1]))
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	409
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	410 else:
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	411 # program name
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	412 if ui.verbose or with_version:
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	413 show_version(ui)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	414 else:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	415 ui.status("Mercurial Distributed SCM\n")
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	416 ui.status('\n')
843 859e7ea530bd 'hg help -v' shows global options kreijack@inwind.REMOVEME.it parents: 842 diff changeset	417
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	418 # 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	419 if cmd == "shortlist":
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	420 ui.status('basic commands (use "hg help" '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	421 'for the full list or option "-v" for details):\n\n')
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	422 elif ui.verbose:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	423 ui.status('list of commands:\n\n')
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	424 else:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	425 ui.status('list of commands (use "hg help -v" '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	426 'to show aliases and global options):\n\n')
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	427
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	428 h = {}
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	429 cmds = {}
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	430 for c, e in table.items():
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	431 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	432 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	433 continue
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	434 f = f.lstrip("^")
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	435 if not ui.debugflag and f.startswith("debug"):
ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	436 continue
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	437 d = ""
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	438 if e[0].__doc__:
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	439 d = e[0].__doc__.splitlines(0)[0].rstrip()
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	440 h[f] = d
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	441 cmds[f]=c.lstrip("^")
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	442
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	443 fns = h.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	444 fns.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	445 m = max(map(len, fns))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	446 for f in fns:
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	447 if ui.verbose:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	448 commands = cmds[f].replace("\|",", ")
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	449 ui.write(" %s:\n %s\n"%(commands,h[f]))
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	450 else:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	451 ui.write(' %-*s %s\n' % (m, f, h[f]))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	452
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	453 # global options
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	454 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	455 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	456
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	457 # 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	458 opt_output = []
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	459 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	460 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	461 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	462 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	463 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	464 "%s%s" % (desc,
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	465 default and " (default: %s)" % default
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	466 or "")))
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	467
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	468 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	469 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	470 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	471 if second:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	472 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	473 else:
d8279ca39dc7 Adjust display and alignment of command options to match global options. Thomas Arendsen Hein <thomas@intevation.de> parents: 1051 diff changeset	474 ui.write("%s\n" % first)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	475
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	476 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	477
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	478 def add(ui, repo, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	479 '''add the specified files on the next commit'''
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	480 names = []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	481 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	482 if exact:
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	483 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	484 elif repo.dirstate.state(abs) == '?':
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	485 ui.status('adding %s\n' % rel)
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	486 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	487 repo.add(names)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	488
766 b444a7e053f1 Get addremove to use new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 764 diff changeset	489 def addremove(ui, repo, pats, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	490 """add all new files, delete all missing files"""
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	491 add, remove = [], []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	492 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	493 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	494 add.append(abs)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	495 if not exact:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	496 ui.status('adding ', rel, '\n')
880 409a9a7b0da2 addremove was not correctly finding removed files when given mason@suse.com parents: 879 diff changeset	497 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	498 remove.append(abs)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	499 if not exact:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	500 ui.status('removing ', rel, '\n')
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	501 repo.add(add)
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	502 repo.remove(remove)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	503
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	504 def annotate(ui, repo, pats, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	505 """show changeset information per file line"""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	506 def getnode(rev):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	507 return short(repo.changelog.node(rev))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	508
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	509 ucache = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	510 def getname(rev):
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	511 cl = repo.changelog.read(repo.changelog.node(rev))
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	512 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	513
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	514 if not pats:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	515 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	516
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	517 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	518 if not opts['user'] and not opts['changeset']:
29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	519 opts['number'] = 1
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	520
715 938dd667ca21 Make annotate use option --rev instead od --revision like other commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 714 diff changeset	521 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	522 node = repo.changelog.lookup(opts['rev'])
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	523 else:
29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	524 node = repo.dirstate.parents()[0]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	525 change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	526 mmap = repo.manifest.read(change[0])
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	527
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	528 for src, abs, rel, exact in walk(repo, pats, opts):
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	529 if abs not in mmap:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	530 ui.warn("warning: %s is not in the repository!\n" % rel)
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	531 continue
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	532
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	533 f = repo.file(abs)
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	534 if not opts['text'] and util.binary(f.read(mmap[abs])):
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	535 ui.write("%s: binary file\n" % rel)
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	536 continue
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	537
836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	538 lines = f.annotate(mmap[abs])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	539 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	540
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	541 for o, f in opmap:
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	542 if opts[o]:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	543 l = [f(n) for n, dummy in lines]
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	544 if l:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	545 m = max(map(len, l))
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	546 pieces.append(["%*s" % (m, x) for x in l])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	547
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	548 if pieces:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	549 for p, l in zip(zip(*pieces), lines):
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	550 ui.write("%s: %s" % (" ".join(p), l[1]))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	551
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	552 def bundle(ui, repo, fname, dest="default-push", **opts):
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	553 """create a changegroup file"""
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	554 f = open(fname, "wb")
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	555 dest = ui.expandpath(dest)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	556 other = hg.repository(ui, dest)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	557 o = repo.findoutgoing(other)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	558 cg = repo.changegroup(o)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	559
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	560 try:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	561 f.write("HG10")
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	562 z = bz2.BZ2Compressor(9)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	563 while 1:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	564 chunk = cg.read(4096)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	565 if not chunk:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	566 break
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	567 f.write(z.compress(chunk))
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	568 f.write(z.flush())
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	569 except:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	570 os.unlink(fname)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	571
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	572 def cat(ui, repo, file1, rev=None, **opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	573 """output the latest or given revision of a file"""
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	574 r = repo.file(relpath(repo, [file1])[0])
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	575 if rev:
918 fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	576 try:
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	577 # assume all revision numbers are for changesets
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	578 n = repo.lookup(rev)
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	579 change = repo.changelog.read(n)
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	580 m = repo.manifest.read(change[0])
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	581 n = m[relpath(repo, [file1])[0]]
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	582 except hg.RepoError, KeyError:
fe69ecd3437c hg cat: accept changeset hashes mpm@selenic.com parents: 917 diff changeset	583 n = r.lookup(rev)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	584 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	585 n = r.tip()
729 626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	586 fp = make_file(repo, r, opts['output'], node=n)
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	587 fp.write(r.read(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	588
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	589 def clone(ui, source, dest=None, **opts):
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	590 """make a copy of an existing repository"""
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	591 if dest is None:
528 648386fabf9c Fix clone bug wth trailing slash mpm@selenic.com parents: 527 diff changeset	592 dest = os.path.basename(os.path.normpath(source))
532 2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	593
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	594 if os.path.exists(dest):
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	595 ui.warn("abort: destination '%s' already exists\n" % dest)
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	596 return 1
523 003df62ae39f [PATCH] Force "hg clone" to always create a new directory mpm@selenic.com parents: 522 diff changeset	597
891 a9b843b114f9 Fix clone when target directory is relative. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	598 dest = os.path.realpath(dest)
a9b843b114f9 Fix clone when target directory is relative. Bryan O'Sullivan <bos@serpentine.com> parents: 886 diff changeset	599
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	600 class Dircleanup:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	601 def __init__(self, dir_):
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	602 self.rmtree = shutil.rmtree
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	603 self.dir_ = dir_
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	604 os.mkdir(dir_)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	605 def close(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	606 self.dir_ = None
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	607 def __del__(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	608 if self.dir_:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	609 self.rmtree(self.dir_, True)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	610
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	611 if opts['ssh']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	612 ui.setconfig("ui", "ssh", opts['ssh'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	613 if opts['remotecmd']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	614 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	615
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	616 d = Dircleanup(dest)
1221 89f899caecb5 clone: directory names take precedence over symbolic names TK Soh <teekaysoh@yahoo.com> parents: 1220 diff changeset	617 if not os.path.exists(source):
89f899caecb5 clone: directory names take precedence over symbolic names TK Soh <teekaysoh@yahoo.com> parents: 1220 diff changeset	618 source = ui.expandpath(source)
562 be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc mpm@selenic.com parents: 561 diff changeset	619 abspath = source
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 632 diff changeset	620 other = hg.repository(ui, source)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	621
675 49de76abc4da hg clone stored path fix Mikael Berthe <mikael@lilotux.net> parents: 674 diff changeset	622 if other.dev() != -1:
49de76abc4da hg clone stored path fix Mikael Berthe <mikael@lilotux.net> parents: 674 diff changeset	623 abspath = os.path.abspath(source)
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	624 copyfile = (os.stat(dest).st_dev == other.dev()
df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	625 and getattr(os, 'link', None) or shutil.copy2)
df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	626 if copyfile is not shutil.copy2:
df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	627 ui.note("cloning by hardlink\n")
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	628
1209 920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	629 # we use a lock here because if we race with commit, we can
920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	630 # end up with extra data in the cloned revlogs that's not
920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	631 # pointed to by changesets, thus causing verify to fail
920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	632 l1 = lock.lock(os.path.join(source, ".hg", "lock"))
917 7f3f55903496 Fix hg clone race with writer mpm@selenic.com parents: 915 diff changeset	633
1209 920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	634 # and here to avoid premature writing to the target
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	635 os.mkdir(os.path.join(dest, ".hg"))
1209 920682a532df Tighten up clone locking mpm@selenic.com parents: 1208 diff changeset	636 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	637
1208 4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	638 files = "data 00manifest.d 00manifest.i 00changelog.d 00changelog.i"
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	639 for f in files.split():
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	640 src = os.path.join(source, ".hg", f)
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	641 dst = os.path.join(dest, ".hg", f)
4644df4944ff Clean up local clone file list mpm@selenic.com parents: 1207 diff changeset	642 util.copyfiles(src, dst, copyfile)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	643
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	644 repo = hg.repository(ui, dest)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	645
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	646 else:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	647 repo = hg.repository(ui, dest, create=1)
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	648 repo.pull(other)
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	649
1206 6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	650 f = repo.opener("hgrc", "w")
6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	651 f.write("[paths]\n")
6512d352d6c1 Redo local clone hgrc fix mpm@selenic.com parents: 1205 diff changeset	652 f.write("default = %s\n" % abspath)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	653
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	654 if not opts['noupdate']:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	655 update(ui, repo)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	656
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	657 d.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	658
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	659 def commit(ui, repo, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	660 """commit the specified files or all outstanding changes"""
763 84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	661 if opts['text']:
84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	662 ui.warn("Warning: -t and --text is deprecated,"
84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	663 " please use -m or --message instead.\n")
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	664 message = opts['message'] or opts['text']
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	665 logfile = opts['logfile']
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	666 if not message and logfile:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	667 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	668 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	669 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	670 else:
aa5b726e9619 Add '-' support to the commit logfile option to read message from stdin. mark.williamson@cl.cam.ac.uk parents: 898 diff changeset	671 message = open(logfile).read()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	672 except IOError, why:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	673 ui.warn("Can't read commit message %s: %s\n" % (logfile, why))
289 266396e32006 hg commit: add -t and -l options mpm@selenic.com parents: 286 diff changeset	674
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	675 if opts['addremove']:
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	676 addremove(ui, repo, pats, *opts)
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	677 cwd = repo.getcwd()
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	678 if not pats and cwd:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	679 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	680 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	681 fns, match, anypats = matchpats(repo, (pats and repo.getcwd()) or '',
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	682 pats, opts)
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	683 if pats:
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	684 c, a, d, u = repo.changes(files=fns, match=match)
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	685 files = c + a + [fn for fn in d if repo.dirstate.state(fn) == 'r']
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	686 else:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	687 files = []
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	688 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	689 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	690 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	691 raise util.Abort(str(inst))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	692
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	693 def copy(ui, repo, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	694 """mark a file as copied or renamed for the next commit"""
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	695 return repo.copy(*relpath(repo, (source, dest)))
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	696
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	697 def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	698 """validate the correctness of the current dirstate"""
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	699 parent1, parent2 = repo.dirstate.parents()
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	700 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	701 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	702 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	703 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	704 m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	705 m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	706 m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	707 m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	708 errors = 0
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	709 for f in dc:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	710 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	711 if state in "nr" and f not in m1:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	712 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	713 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	714 if state in "a" and f in m1:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	715 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	716 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	717 if state in "m" and f not in m1 and f not in m2:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	718 ui.warn("%s in state %s, but not in either manifest\n" %
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	719 (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	720 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	721 for f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	722 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	723 if state not in "nrm":
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	724 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	725 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	726 if errors:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	727 raise util.Abort(".hg/dirstate inconsistent with current parent's manifest")
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	728
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	729 def debugconfig(ui):
1053 1539ca091d86 Added missing doc strings for two new debug commmands. Thomas Arendsen Hein <thomas@intevation.de> parents: 1052 diff changeset	730 """show combined config settings from all hgrc files"""
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	731 try:
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	732 repo = hg.repository(ui)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	733 except hg.RepoError:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	734 pass
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	735 for section, name, value in ui.walkconfig():
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	736 ui.write('%s.%s=%s\n' % (section, name, value))
25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	737
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	738 def debugstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	739 """show the contents of the current dirstate"""
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	740 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	741 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	742 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	743 keys.sort()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	744 for file_ in keys:
791 040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	745 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	746 % (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	747 time.strftime("%x %X",
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	748 time.localtime(dc[file_][3])), file_))
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	749 for f in repo.dirstate.copies:
1126 624a3a4fa232 Changed printing of copies in hg debugstate to: "copy: source -> dest" Thomas Arendsen Hein <thomas@intevation.de> parents: 1116 diff changeset	750 ui.write("copy: %s -> %s\n" % (repo.dirstate.copies[f], f))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	751
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	752 def debugdata(ui, file_, rev):
4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	753 """dump the contents of an data file revision"""
1093 1f1661c58283 commands: use revlog directly for debug commands mpm@selenic.com parents: 1092 diff changeset	754 r = revlog.revlog(file, file_[:-2] + ".i", file_)
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	755 ui.write(r.revision(r.lookup(rev)))
4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	756
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	757 def debugindex(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	758 """dump the contents of an index file"""
1093 1f1661c58283 commands: use revlog directly for debug commands mpm@selenic.com parents: 1092 diff changeset	759 r = revlog.revlog(file, file_, "")
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	760 ui.write(" rev offset length base linkrev" +
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	761 " nodeid p1 p2\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	762 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	763 e = r.index[i]
989 1b6eb272b238 Reformat debugindex output mpm@selenic.com parents: 988 diff changeset	764 ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	765 i, e[0], e[1], e[2], e[3],
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	766 short(e[6]), short(e[4]), short(e[5])))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	767
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	768 def debugindexdot(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	769 """dump an index DAG as a .dot file"""
1093 1f1661c58283 commands: use revlog directly for debug commands mpm@selenic.com parents: 1092 diff changeset	770 r = revlog.revlog(file, file_, "")
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	771 ui.write("digraph G {\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	772 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	773 e = r.index[i]
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	774 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	775 if e[5] != nullid:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	776 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	777 ui.write("}\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	778
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	779 def debugrename(ui, repo, file, rev=None):
1194 c165cbf56bb1 Add doc string for debugrename. bos@serpentine.internal.keyresearch.com parents: 1193 diff changeset	780 """dump rename information"""
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	781 r = repo.file(relpath(repo, [file])[0])
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	782 if rev:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	783 try:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	784 # assume all revision numbers are for changesets
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	785 n = repo.lookup(rev)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	786 change = repo.changelog.read(n)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	787 m = repo.manifest.read(change[0])
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	788 n = m[relpath(repo, [file])[0]]
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	789 except hg.RepoError, KeyError:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	790 n = r.lookup(rev)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	791 else:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	792 n = r.tip()
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	793 m = r.renamed(n)
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	794 if m:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	795 ui.write("renamed from %s:%s\n" % (m[0], hex(m[1])))
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	796 else:
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	797 ui.write("not renamed\n")
0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	798
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	799 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	800 """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	801 items = list(walk(repo, pats, opts))
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	802 if not items:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	803 return
1058 402279974aea Use ui.write instead of print in debugwalk. Bryan O'Sullivan <bos@serpentine.com> parents: 1057 diff changeset	804 fmt = '%%s %%-%ds %%-%ds %%s\n' % (
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	805 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	806 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	807 for src, abs, rel, exact in items:
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	808 ui.write(fmt % (src, abs, rel, exact and 'exact' or ''))
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	809
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	810 def diff(ui, repo, pats, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	811 """diff working directory (or selected files)"""
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	812 node1, node2 = None, None
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	813 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	814
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	815 if len(revs) > 0:
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	816 node1 = revs[0]
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	817 if len(revs) > 1:
e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	818 node2 = revs[1]
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	819 if len(revs) > 2:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	820 raise util.Abort("too many revisions to diff")
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	821
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	822 files = []
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	823 match = util.always
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	824 if pats:
953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	825 roots, match, results = makewalk(repo, pats, opts)
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	826 for src, abs, rel, exact in results:
879 953ccddd57bd dirstate walking optimizations mason@suse.com parents: 871 diff changeset	827 files.append(abs)
1014 e37cd99fa909 Clean up argument passing for dodiff mpm@selenic.com parents: 989 diff changeset	828
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	829 dodiff(sys.stdout, ui, repo, node1, node2, files, match=match,
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	830 text=opts['text'])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	831
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	832 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	833 node = repo.lookup(changeset)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	834 prev, other = repo.changelog.parents(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	835 change = repo.changelog.read(node)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	836
729 626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	837 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	838 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	839 revwidth=revwidth)
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	840 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	841 ui.note("%s\n" % fp.name)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	842
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	843 fp.write("# HG changeset patch\n")
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	844 fp.write("# User %s\n" % change[1])
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	845 fp.write("# Node ID %s\n" % hex(node))
0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	846 fp.write("# Parent %s\n" % hex(prev))
0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	847 if other != nullid:
0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	848 fp.write("# Parent %s\n" % hex(other))
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	849 fp.write(change[4].rstrip())
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	850 fp.write("\n\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	851
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	852 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	853 if fp != sys.stdout:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	854 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	855
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	856 def export(ui, repo, changesets, *opts):
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	857 """dump the header and diffs for one or more changesets"""
610 4c02464cb9f0 check export options for changeset before running shaleh@speakeasy.net parents: 609 diff changeset	858 if not changesets:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	859 raise util.Abort("export requires at least one changeset")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	860 seqno = 0
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	861 revs = list(revrange(ui, repo, changesets))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	862 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	863 revwidth = max(map(len, revs))
755 87e2b094ab86 Show filenames for hg export in verbose mode on a separate lines. Thomas Arendsen Hein <thomas@intevation.de> parents: 750 diff changeset	864 ui.note(len(revs) > 1 and "Exporting patches:\n" or "Exporting patch:\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	865 for cset in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	866 seqno += 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	867 doexport(ui, repo, cset, seqno, total, revwidth, opts)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	868
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	869 def forget(ui, repo, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	870 """don't add the specified files on the next commit"""
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	871 forget = []
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	872 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	873 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	874 forget.append(abs)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	875 if not exact:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	876 ui.status('forgetting ', rel, '\n')
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	877 repo.forget(forget)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	878
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	879 def grep(ui, repo, pattern, pats, *opts):
1060 e453d2053b2e Merge from BOS, fix help mpm@selenic.com parents: 1054 1059 diff changeset	880 """search for a pattern in specified files and revisions"""
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	881 reflags = 0
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	882 if opts['ignore_case']:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	883 reflags \|= re.I
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	884 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	885 sep, eol = ':', '\n'
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	886 if opts['print0']:
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	887 sep = eol = '\0'
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	888
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	889 fcache = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	890 def getfile(fn):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	891 if fn not in fcache:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	892 fcache[fn] = repo.file(fn)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	893 return fcache[fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	894
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	895 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	896 begin = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	897 linenum = 0
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	898 while True:
4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	899 match = regexp.search(body, begin)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	900 if not match:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	901 break
1059 4eab07ef66e2 grep: speed up matching, and only return one match per line. bos@serpentine.internal.keyresearch.com parents: 1058 diff changeset	902 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	903 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	904 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	905 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	906 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	907 begin = lend + 1
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	908
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	909 class linestate:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	910 def __init__(self, line, linenum, colstart, colend):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	911 self.line = line
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	912 self.linenum = linenum
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	913 self.colstart = colstart
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	914 self.colend = colend
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	915 def __eq__(self, other):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	916 return self.line == other.line
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	917 def __hash__(self):
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	918 return hash(self.line)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	919
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	920 matches = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	921 def grepbody(fn, rev, body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	922 matches[rev].setdefault(fn, {})
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	923 m = matches[rev][fn]
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	924 for lnum, cstart, cend, line in matchlines(body):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	925 s = linestate(line, lnum, cstart, cend)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	926 m[s] = s
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	927
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	928 prev = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	929 ucache = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	930 def display(fn, rev, states, prevstates):
1061 fed8d078840b Fix set type usage for Python 2.3 mpm@selenic.com parents: 1060 diff changeset	931 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	932 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	933 counts = {'-': 0, '+': 0}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	934 filerevmatches = {}
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	935 for l in diff:
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	936 if incrementing or not opts['all']:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	937 change = ((l in prevstates) and '-') or '+'
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	938 r = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	939 else:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	940 change = ((l in states) and '-') or '+'
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	941 r = prev[fn]
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	942 cols = [fn, str(rev)]
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	943 if opts['line_number']: cols.append(str(l.linenum))
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	944 if opts['all']: cols.append(change)
1147 d32b91ebad5d Merge with TAH. bos@serpentine.internal.keyresearch.com parents: 1146 1133 diff changeset	945 if opts['user']: 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	946 ucache))
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	947 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	948 c = (fn, rev)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	949 if c in filerevmatches: continue
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	950 filerevmatches[c] = 1
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	951 else:
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	952 cols.append(l.line)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	953 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	954 counts[change] += 1
bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	955 return counts['+'], counts['-']
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	956
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	957 fstate = {}
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	958 skip = {}
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	959 changeiter, getchange = walkchangerevs(ui, repo, repo.getcwd(), pats, opts)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	960 count = 0
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	961 for st, rev, fns in changeiter:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	962 if st == 'window':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	963 incrementing = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	964 matches.clear()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	965 elif st == 'add':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	966 change = repo.changelog.read(repo.lookup(str(rev)))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	967 mf = repo.manifest.read(change[0])
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	968 matches[rev] = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	969 for fn in fns:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	970 if fn in skip: continue
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	971 fstate.setdefault(fn, {})
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	972 try:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	973 grepbody(fn, rev, getfile(fn).read(mf[fn]))
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	974 except KeyError:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	975 pass
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	976 elif st == 'iter':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	977 states = matches[rev].items()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	978 states.sort()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	979 for fn, m in states:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	980 if fn in skip: continue
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	981 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	982 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	983 count += pos + neg
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	984 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	985 skip[fn] = True
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	986 fstate[fn] = m
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	987 prev[fn] = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	988
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	989 if not incrementing:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	990 fstate = fstate.items()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	991 fstate.sort()
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	992 for fn, state in fstate:
1145 bd917e1a26dd grep: change default to printing first matching rev. Bryan O'Sullivan <bos@serpentine.com> parents: 1116 diff changeset	993 if fn in skip: continue
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	994 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	995 return (count == 0 and 1) or 0
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	996
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	997 def heads(ui, repo, **opts):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	998 """show current repository heads"""
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	999 heads = repo.changelog.heads()
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1000 br = None
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1001 if opts['branches']:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1002 br = repo.branchlookup(heads)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1003 for n in repo.changelog.heads():
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1004 show_changeset(ui, repo, changenode=n, brinfo=br)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	1005
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1006 def identify(ui, repo):
a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1007 """print information about the working copy"""
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1008 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	1009 if not parents:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	1010 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	1011 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	1012
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1013 hexfunc = ui.verbose and hex or short
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1014 (c, a, d, u) = repo.changes()
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1015 output = ["%s%s" % ('+'.join([hexfunc(parent) for parent in parents]),
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1016 (c or a or d) and "+" or "")]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1017
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1018 if not ui.quiet:
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1019 # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1020 parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1021 for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1022 # 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	1023 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	1024 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	1025
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	1026 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	1027
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1028 def import_(ui, repo, patch1, patches, *opts):
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1029 """import an ordered set of patches"""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1030 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1031
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1032 if not opts['force']:
022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1033 (c, a, d, u) = repo.changes()
022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1034 if c or a or d:
022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1035 ui.warn("abort: outstanding uncommitted changes!\n")
022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1036 return 1
022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1037
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1038 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1039 strip = opts["strip"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1040
1193 04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1041 mailre = re.compile(r'(?:From \|[\w-]+:)')
04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1042 diffre = re.compile(r'(?:diff -\|--- .*\s+\w+ \w+ +\d+ \d+:\d+:\d+ \d+)')
1190 737f9b90c571 Make import command reject patches that resemble email messages. bos@serpentine.internal.keyresearch.com parents: 1189 diff changeset	1043
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1044 for patch in patches:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1045 ui.status("applying %s\n" % patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1046 pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1047
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1048 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	1049 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	1050 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	1051 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	1052 line = line.rstrip()
1220 8baa29e36b14 import: fix bug in mail-format detection mpm@selenic.com parents: 1218 diff changeset	1053 if (not message and not hgpatch and
8baa29e36b14 import: fix bug in mail-format detection mpm@selenic.com parents: 1218 diff changeset	1054 mailre.match(line) and not opts['force']):
1190 737f9b90c571 Make import command reject patches that resemble email messages. bos@serpentine.internal.keyresearch.com parents: 1189 diff changeset	1055 if len(line) > 35: line = line[:32] + '...'
737f9b90c571 Make import command reject patches that resemble email messages. bos@serpentine.internal.keyresearch.com parents: 1189 diff changeset	1056 raise util.Abort('first line looks like a '
737f9b90c571 Make import command reject patches that resemble email messages. bos@serpentine.internal.keyresearch.com parents: 1189 diff changeset	1057 'mail header: ' + line)
1193 04d1ca8ae9ec Fortify the recognition of a diff header. bos@serpentine.internal.keyresearch.com parents: 1192 diff changeset	1058 if diffre.match(line):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1059 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	1060 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	1061 # 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	1062 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	1063 user = line[7:]
80ed193efff7 On importing the result of 'hg export', parse while reading and drop headers. Thomas Arendsen Hein <thomas@intevation.de> parents: 700 diff changeset	1064 ui.debug('User: %s\n' % 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	1065 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	1066 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	1067 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	1068 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	1069 hgpatch = True
852 1df0983eb589 Allow HG patch to appear late in the input stream Samuel Tardieu <sam@rfc1149.net> parents: 849 diff changeset	1070 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	1071 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1072 message.append(line)
607 94744f6fe0e7 [PATCH] Parse and use header data from an hg export'ed changeset mpm@selenic.com parents: 605 diff changeset	1073
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1074 # make sure message isn't empty
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1075 if not message:
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1076 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	1077 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1078 message = "%s\n" % '\n'.join(message)
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1079 ui.debug('message:\n%s\n' % message)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1080
826 16700cdd9055 Allow import from files with spaces Kyle Moffett <mrmacman_g4@mac.com> parents: 825 diff changeset	1081 f = os.popen("patch -p%d < '%s'" % (strip, pf))
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1082 files = []
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1083 for l in f.read().splitlines():
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1084 l.rstrip('\r\n');
481 2705d20f77c9 hg import checking for quiet mode didn't work. Fixed using the ui module. Thomas Arendsen Hein <thomas@intevation.de> parents: 480 diff changeset	1085 ui.status("%s\n" % l)
674 6513ba7d858a Make consistent use of str.startswith() in conditionals. chad.netzer@gmail.com parents: 668 diff changeset	1086 if l.startswith('patching file '):
443 470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	1087 pf = l[14:]
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	1088 if pf not in files:
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	1089 files.append(pf)
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	1090 patcherr = f.close()
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	1091 if patcherr:
870 a82eae840447 Teach walk code about absolute paths. Bryan O'Sullivan <bos@serpentine.com> parents: 868 diff changeset	1092 raise util.Abort("patch failed")
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1093
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1094 if len(files) > 0:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1095 addremove(ui, repo, *files)
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1096 repo.commit(files, message, user)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	1097
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1098 def incoming(ui, repo, source="default", **opts):
928 6f2c3bcbfaaf hg incoming/outgoing: fix tests and update man page mpm@selenic.com parents: 927 diff changeset	1099 """show new changesets found in source"""
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1100 source = ui.expandpath(source)
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1101 other = hg.repository(ui, source)
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1102 if not other.local():
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1103 ui.warn("abort: incoming doesn't work for remote"
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1104 + " repositories yet, sorry!\n")
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1105 return 1
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1106 o = repo.findincoming(other)
931 32e8f64b25b0 Fix incoming for empty set mpm@selenic.com parents: 928 diff changeset	1107 if not o:
32e8f64b25b0 Fix incoming for empty set mpm@selenic.com parents: 928 diff changeset	1108 return
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1109 o = other.newer(o)
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1110 o.reverse()
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1111 for n in o:
5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1112 show_changeset(ui, other, changenode=n)
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1113 if opts['patch']:
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1114 prev = other.changelog.parents(n)[0]
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1115 dodiff(ui, ui, other, prev, n)
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1116 ui.write("\n")
927 5a830d7bea52 Add hg incoming command for local repositories mpm@selenic.com parents: 924 diff changeset	1117
907 652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1118 def init(ui, dest="."):
652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1119 """create a new repository in the given directory"""
652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1120 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	1121 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	1122 hg.repository(ui, dest, create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	1123
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1124 def locate(ui, repo, pats, *opts):
b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1125 """locate files matching specific patterns"""
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1126 end = opts['print0'] and '\0' or '\n'
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	1127
942 7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple. Bryan O'Sullivan <bos@serpentine.com> parents: 940 diff changeset	1128 for src, abs, rel, exact in walk(repo, pats, opts, '(?:.*/\|)'):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1129 if repo.dirstate.state(abs) == '?':
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1130 continue
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1131 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	1132 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	1133 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1134 ui.write(rel, end)
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	1135
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1136 def log(ui, repo, pats, *opts):
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1137 """show revision history of entire repository or files"""
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1138 class dui:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1139 # Implement and delegate some ui protocol. Save hunks of
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1140 # output for later display in the desired order.
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1141 def __init__(self, ui):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1142 self.ui = ui
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1143 self.hunk = {}
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1144 def bump(self, rev):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1145 self.rev = rev
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1146 self.hunk[rev] = []
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1147 def note(self, *args):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1148 if self.verbose:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1149 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1150 def status(self, *args):
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1151 if not self.quiet:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1152 self.write(*args)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1153 def write(self, *args):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1154 self.hunk[self.rev].append(args)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1155 def __getattr__(self, key):
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1156 return getattr(self.ui, key)
1037 c0a1abf562eb Fix a small corner of log behaviour. bos@serpentine.internal.keyresearch.com parents: 1034 diff changeset	1157 cwd = repo.getcwd()
c0a1abf562eb Fix a small corner of log behaviour. bos@serpentine.internal.keyresearch.com parents: 1034 diff changeset	1158 if not pats and cwd:
c0a1abf562eb Fix a small corner of log behaviour. bos@serpentine.internal.keyresearch.com parents: 1034 diff changeset	1159 opts['include'] = [os.path.join(cwd, i) for i in opts['include']]
c0a1abf562eb Fix a small corner of log behaviour. bos@serpentine.internal.keyresearch.com parents: 1034 diff changeset	1160 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1161 changeiter, getchange = walkchangerevs(ui, repo, (pats and cwd) or '',
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1162 pats, opts)
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1163 for st, rev, fns in changeiter:
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1164 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	1165 du = dui(ui)
1057 2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1166 elif st == 'add':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1167 du.bump(rev)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1168 show_changeset(du, repo, rev)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1169 if opts['patch']:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1170 changenode = repo.changelog.node(rev)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1171 prev, other = repo.changelog.parents(changenode)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1172 dodiff(du, du, repo, prev, changenode, fns)
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1173 du.write("\n\n")
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1174 elif st == 'iter':
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1175 for args in du.hunk[rev]:
2fd15d743b3b Add grep command. Bryan O'Sullivan <bos@serpentine.com> parents: 1042 diff changeset	1176 ui.write(*args)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1177
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1178 def manifest(ui, repo, rev=None):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1179 """output the latest or given revision of the project manifest"""
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1180 if rev:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1181 try:
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1182 # assume all revision numbers are for changesets
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1183 n = repo.lookup(rev)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1184 change = repo.changelog.read(n)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1185 n = change[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1186 except hg.RepoError:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	1187 n = repo.manifest.lookup(rev)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1188 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1189 n = repo.manifest.tip()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1190 m = repo.manifest.read(n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	1191 mf = repo.manifest.readflags(n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1192 files = m.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1193 files.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1194
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1195 for f in files:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1196 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	1197
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1198 def outgoing(ui, repo, dest="default-push", **opts):
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1199 """show changesets not found in destination"""
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1200 dest = ui.expandpath(dest)
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1201 other = hg.repository(ui, dest)
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1202 o = repo.findoutgoing(other)
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1203 o = repo.newer(o)
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1204 o.reverse()
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1205 for n in o:
270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1206 show_changeset(ui, repo, changenode=n)
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1207 if opts['patch']:
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1208 prev = repo.changelog.parents(n)[0]
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1209 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	1210 ui.write("\n")
920 270756aa29d5 Add hg outgoing command mpm@selenic.com parents: 918 diff changeset	1211
706 5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1212 def parents(ui, repo, rev=None):
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1213 """show the parents of the working dir or revision"""
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1214 if rev:
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	1215 p = repo.changelog.parents(repo.lookup(rev))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1216 else:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1217 p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1218
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1219 for n in p:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1220 if n != nullid:
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	1221 show_changeset(ui, repo, changenode=n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1222
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 1061 diff changeset	1223 def paths(ui, search=None):
924 ab681ea2857e updated help text and added manpage section for hg paths TK Soh <teekaysoh@yahoo.com> parents: 921 diff changeset	1224 """show definition of symbolic path names"""
915 24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1225 try:
24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1226 repo = hg.repository(ui=ui)
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1227 except hg.RepoError:
915 24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1228 pass
24a31f46fa13 Let hg paths work outside of repositories mpm@selenic.com parents: 913 diff changeset	1229
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1230 if search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1231 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1232 if name == search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1233 ui.write("%s\n" % path)
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1234 return
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1235 ui.warn("not found!\n")
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1236 return 1
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1237 else:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1238 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1239 ui.write("%s = %s\n" % (name, path))
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1240
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1241 def pull(ui, repo, source="default", **opts):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1242 """pull changes from the specified source"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	1243 source = ui.expandpath(source)
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1244 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	1245
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1246 if opts['ssh']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1247 ui.setconfig("ui", "ssh", opts['ssh'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1248 if opts['remotecmd']:
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1249 ui.setconfig("ui", "remotecmd", opts['remotecmd'])
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1250
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1251 other = hg.repository(ui, source)
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	1252 r = repo.pull(other)
978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	1253 if not r:
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1254 if opts['update']:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1255 return update(ui, repo)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1256 else:
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1257 ui.status("(run 'hg update' to get a working copy)\n")
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1258
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	1259 return r
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1260
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1261 def push(ui, repo, dest="default-push", force=False, ssh=None, remotecmd=None):
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	1262 """push changes to the specified destination"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	1263 dest = ui.expandpath(dest)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	1264 ui.status('pushing to %s\n' % (dest))
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	1265
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1266 if ssh:
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1267 ui.setconfig("ui", "ssh", ssh)
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1268 if remotecmd:
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1269 ui.setconfig("ui", "remotecmd", remotecmd)
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1270
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	1271 other = hg.repository(ui, dest)
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1272 r = repo.push(other, force)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	1273 return r
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	1274
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	1275 def rawcommit(ui, repo, flist, *rc):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1276 "raw commit interface"
763 84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	1277 if rc['text']:
84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	1278 ui.warn("Warning: -t and --text is deprecated,"
84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	1279 " please use -m or --message instead.\n")
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1280 message = rc['message'] or rc['text']
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1281 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	1282 try:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1283 message = open(rc['logfile']).read()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1284 except IOError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1285 pass
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1286 if not message and not rc['logfile']:
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1287 ui.warn("abort: missing commit message\n")
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1288 return 1
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1289
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	1290 files = relpath(repo, list(flist))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1291 if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	1292 files += open(rc['files']).read().splitlines()
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	1293
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	1294 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	1295
1202 71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1296 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1297 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	1298 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1299 raise util.Abort(str(inst))
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1300
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1301 def recover(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1302 """roll back an interrupted transaction"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1303 repo.recover()
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1304
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1305 def remove(ui, repo, pat, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1306 """remove the specified files on the next commit"""
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1307 names = []
1189 4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1308 def okaytoremove(abs, rel, exact):
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1309 c, a, d, u = repo.changes(files = [abs])
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1310 reason = None
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1311 if c: reason = 'is modified'
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1312 elif a: reason = 'has been marked for add'
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1313 elif u: reason = 'not managed'
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1314 if reason and exact:
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1315 ui.warn('not removing %s: file %s\n' % (rel, reason))
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1316 else:
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1317 return True
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1318 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	1319 if okaytoremove(abs, rel, exact):
4cbcc54695b2 Make removal check more complete and informative. Bryan O'Sullivan <bos@serpentine.com> parents: 1188 diff changeset	1320 if not exact: 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	1321 names.append(abs)
b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1322 repo.remove(names)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1323
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1324 def revert(ui, repo, names, *opts):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1325 """revert modified files or dirs back to their unmodified states"""
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1326 node = opts['rev'] and repo.lookup(opts['rev']) or \
38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1327 repo.dirstate.parents()[0]
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1328 root = os.path.realpath(repo.root)
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1329
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1330 def trimpath(p):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1331 p = os.path.realpath(p)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1332 if p.startswith(root):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1333 rest = p[len(root):]
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1334 if not rest:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1335 return rest
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1336 if p.startswith(os.sep):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1337 return rest[1:]
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1338 return p
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1339
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1340 relnames = map(trimpath, names or [os.getcwd()])
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1341 chosen = {}
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	1342
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1343 def choose(name):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1344 def body(name):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1345 for r in relnames:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1346 if not name.startswith(r):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1347 continue
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1348 rest = name[len(r):]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1349 if not rest:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1350 return r, True
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1351 depth = rest.count(os.sep)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1352 if not r:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1353 if depth == 0 or not opts['nonrecursive']:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1354 return r, True
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1355 elif rest[0] == os.sep:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1356 if depth == 1 or not opts['nonrecursive']:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1357 return r, True
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1358 return None, False
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1359 relname, ret = body(name)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1360 if ret:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1361 chosen[relname] = 1
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1362 return ret
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1363
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1364 r = repo.update(node, False, True, choose, False)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1365 for n in relnames:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1366 if n not in chosen:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1367 ui.warn('error: no matches for %s\n' % n)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1368 r = 1
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1369 sys.stdout.flush()
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1370 return r
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	1371
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1372 def root(ui, repo):
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1373 """print the root (top) of the current working dir"""
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1374 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1375
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1376 def serve(ui, repo, **opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1377 """export the repository via HTTP"""
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1378
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1379 if opts["stdio"]:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1380 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	1381 sys.stdout = sys.stderr
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1382
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1383 def getarg():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1384 argline = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1385 arg, l = argline.split()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1386 val = fin.read(int(l))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1387 return arg, val
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1388 def respond(v):
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1389 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	1390 fout.write(v)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1391 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1392
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1393 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1394
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1395 while 1:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1396 cmd = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1397 if cmd == '':
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1398 return
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1399 if cmd == "heads":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1400 h = repo.heads()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1401 respond(" ".join(map(hex, h)) + "\n")
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1402 if cmd == "lock":
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1403 lock = repo.lock()
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1404 respond("")
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1405 if cmd == "unlock":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1406 if lock:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1407 lock.release()
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1408 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1409 respond("")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1410 elif cmd == "branches":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1411 arg, nodes = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1412 nodes = map(bin, nodes.split(" "))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1413 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1414 for b in repo.branches(nodes):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1415 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	1416 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1417 elif cmd == "between":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1418 arg, pairs = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1419 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	1420 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1421 for b in repo.between(pairs):
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1422 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	1423 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1424 elif cmd == "changegroup":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1425 nodes = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1426 arg, roots = getarg()
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1427 nodes = map(bin, roots.split(" "))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1428
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1429 cg = repo.changegroup(nodes)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1430 while 1:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1431 d = cg.read(4096)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1432 if not d:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1433 break
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1434 fout.write(d)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1435
667 31a9aa890016 A number of minor fixes to problems that pychecker found. mark.williamson@cl.cam.ac.uk parents: 654 diff changeset	1436 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1437
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1438 elif cmd == "addchangegroup":
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1439 if not lock:
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1440 respond("not locked")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1441 continue
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1442 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1443
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1444 r = repo.addchangegroup(fin)
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1445 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1446
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1447 optlist = "name templates style address port ipv6 accesslog errorlog"
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1448 for o in optlist.split():
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1449 if opts[o]:
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1450 ui.setconfig("web", o, opts[o])
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1451
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	1452 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	1453 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	1454 except socket.error, inst:
862f53c1d0f9 hg serve: print a more useful error message if server can't start. Bryan O'Sullivan <bos@serpentine.com> parents: 1147 diff changeset	1455 raise util.Abort('cannot start server: ' + inst.args[1])
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1456
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1457 if ui.verbose:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1458 addr, port = httpd.socket.getsockname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1459 if addr == '0.0.0.0':
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1460 addr = socket.gethostname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1461 else:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1462 try:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1463 addr = socket.gethostbyaddr(addr)[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1464 except socket.error:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1465 pass
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1466 if port != 80:
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1467 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	1468 else:
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1469 ui.status('listening at http://%s/\n' % addr)
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1470 httpd.serve_forever()
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1471
731 91ca3afab8e8 Add name matching to status command. Bryan O'Sullivan <bos@serpentine.com> parents: 729 diff changeset	1472 def status(ui, repo, pats, *opts):
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1473 '''show changed files in the working directory
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1474
746 9095e3456ea7 Change C to M in status mpm@selenic.com parents: 745 diff changeset	1475 M = modified
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1476 A = added
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1477 R = removed
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1478 ? = not tracked
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1479 '''
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	1480
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1481 cwd = repo.getcwd()
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1482 files, matchfn, anypats = matchpats(repo, cwd, pats, opts)
884 087771ebe2e6 Fix walk code for files that do not exist anywhere, and unhandled types. Bryan O'Sullivan <bos@serpentine.com> parents: 883 diff changeset	1483 (c, a, d, u) = [[util.pathto(cwd, x) for x in n]
823 f0446f6963d2 Use list comprehension in hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 820 diff changeset	1484 for n in repo.changes(files=files, match=matchfn)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1485
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1486 changetypes = [('modified', 'M', c),
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1487 ('added', 'A', a),
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1488 ('removed', 'R', d),
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1489 ('unknown', '?', u)]
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1490
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	1491 end = opts['print0'] and '\0' or '\n'
1106 95a044b73bd5 Whitespace cleanup. Thomas Arendsen Hein <thomas@intevation.de> parents: 1105 diff changeset	1492
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1493 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	1494 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	1495 if opts['no_status']:
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	1496 format = "%%s%s" % end
6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	1497 else:
6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	1498 format = "%s %%s%s" % (char, end);
1106 95a044b73bd5 Whitespace cleanup. Thomas Arendsen Hein <thomas@intevation.de> parents: 1105 diff changeset	1499
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1500 for f in changes:
1085 6f94688b81b6 status: added option -p and -0 to assist xargs TK Soh <teekaysoh@yahoo.com> parents: 1081 diff changeset	1501 ui.write(format % f)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1502
700 d01b93efecd6 Removed extra spaces for default parameters according to PEP8. Thomas Arendsen Hein <thomas@intevation.de> parents: 699 diff changeset	1503 def tag(ui, repo, name, rev=None, **opts):
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1504 """add a tag for the current tip or a given revision"""
763 84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	1505 if opts['text']:
84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	1506 ui.warn("Warning: -t and --text is deprecated,"
84f9ac74cc30 Added deprecation warnings if -t or --text is used for commits. Thomas Arendsen Hein <thomas@intevation.de> parents: 762 diff changeset	1507 " please use -m or --message instead.\n")
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1508 if name == "tip":
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1509 ui.warn("abort: 'tip' is a reserved name!\n")
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1510 return -1
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1511 if rev:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1512 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	1513 else:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1514 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	1515
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1516 if name.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1517 ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1518 return -1
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1519
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1520 if opts['local']:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1521 repo.opener("localtags", "a").write("%s %s\n" % (r, name))
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1522 return
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1523
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1524 (c, a, d, u) = repo.changes()
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1525 for x in (c, a, d, u):
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1526 if ".hgtags" in x:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1527 ui.warn("abort: working copy of .hgtags is changed!\n")
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1528 ui.status("(please commit .hgtags manually)\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1529 return -1
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1530
617 285965ddca41 open .hgtags as binary thananck@yahoo.com parents: 615 diff changeset	1531 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	1532 if repo.dirstate.state(".hgtags") == '?':
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1533 repo.add([".hgtags"])
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1534
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1535 message = (opts['message'] or opts['text'] or
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1536 "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	1537 try:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1538 repo.commit([".hgtags"], message, opts['user'], opts['date'])
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1539 except ValueError, inst:
71111d796e40 Commit date validation: more stringent checks, more useful error messages. Bryan O'Sullivan <bos@serpentine.com> parents: 1194 diff changeset	1540 raise util.Abort(str(inst))
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1541
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1542 def tags(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1543 """list repository tags"""
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1544
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	1545 l = repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	1546 l.reverse()
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1547 for t, n in l:
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1548 try:
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1549 r = "%5d:%s" % (repo.changelog.rev(n), hex(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1550 except KeyError:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1551 r = " ?:?"
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1552 ui.write("%-30s %s\n" % (t, r))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1553
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1554 def tip(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1555 """show the tip revision"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1556 n = repo.changelog.tip()
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	1557 show_changeset(ui, repo, changenode=n)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1558
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1559 def unbundle(ui, repo, fname):
1222 a5cb17a2d240 Fix missing docstring for unbundle mpm@selenic.com parents: 1221 diff changeset	1560 """apply a changegroup file"""
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1561 f = urllib.urlopen(fname)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1562
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1563 if f.read(4) != "HG10":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1564 ui.warn("abort: not a Mercurial bundle file!\n")
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1565 return -1
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1566
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1567 class bzread:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1568 def __init__(self, f):
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1569 self.zd = bz2.BZ2Decompressor()
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1570 self.f = f
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1571 self.buf = ""
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1572 def read(self, l):
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1573 while l > len(self.buf):
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1574 r = self.f.read(4096)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1575 if r:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1576 self.buf += self.zd.decompress(r)
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1577 else:
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1578 break
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1579 d, self.buf = self.buf[:l], self.buf[l:]
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1580 return d
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1581
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1582 repo.addchangegroup(bzread(f))
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1583
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1584 def undo(ui, repo):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1585 """undo the last commit or pull
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1586
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1587 Roll back the last pull or commit transaction on the
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1588 repository, restoring the project to its earlier state.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1589
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1590 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	1591 undo and there is no redo.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1592
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1593 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	1594 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	1595 ineffective.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1596 """
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	1597 repo.undo()
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	1598
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1599 def update(ui, repo, node=None, merge=False, clean=False, branch=None):
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1600 '''update or merge working directory
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1601
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1602 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	1603 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	1604 requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1605
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1606 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	1607 current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1608 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	1609 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	1610 are allowed.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1611 '''
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1612 if branch:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1613 br = repo.branchlookup(branch=branch)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1614 found = []
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1615 for x in br:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1616 if branch in br[x]:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1617 found.append(x)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1618 if len(found) > 1:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1619 ui.warn("Found multiple heads for %s\n" % branch)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1620 for x in found:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1621 show_changeset(ui, repo, changenode=x, brinfo=br)
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1622 return 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1623 if len(found) == 1:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1624 node = found[0]
1092 0a02315976ff commands: use node functions directly mpm@selenic.com parents: 1090 diff changeset	1625 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	1626 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1627 ui.warn("branch %s not found\n" % (branch))
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1628 return 1
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1629 else:
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1630 node = node and repo.lookup(node) or repo.changelog.tip()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	1631 return repo.update(node, allow=merge, force=clean)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1632
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1633 def verify(ui, repo):
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1634 """verify the integrity of the repository"""
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1635 return repo.verify()
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1636
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1637 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1638
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1639 table = {
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1640 "^add":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1641 (add,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1642 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1643 ('X', 'exclude', [], 'exclude path from search')],
913 46581ad4bd27 typo fix in command help text TK Soh <teekaysoh@yahoo.com> parents: 910 diff changeset	1644 "hg add [OPTION]... [FILE]..."),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1645 "addremove":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1646 (addremove,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1647 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1648 ('X', 'exclude', [], 'exclude path from search')],
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1649 "hg addremove [OPTION]... [FILE]..."),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1650 "^annotate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1651 (annotate,
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1652 [('r', 'rev', '', 'revision'),
1016 836667830fee Teach annotate about binary files mpm@selenic.com parents: 1015 diff changeset	1653 ('a', 'text', None, 'treat all files as text'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1654 ('u', 'user', None, 'show user'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1655 ('n', 'number', None, 'show revision number'),
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1656 ('c', 'changeset', None, 'show changeset'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1657 ('I', 'include', [], 'include path in search'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1658 ('X', 'exclude', [], 'exclude path from search')],
913 46581ad4bd27 typo fix in command help text TK Soh <teekaysoh@yahoo.com> parents: 910 diff changeset	1659 'hg annotate [OPTION]... FILE...'),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1660 "bundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1661 (bundle,
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1662 [],
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1663 'hg bundle FILE DEST'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1664 "cat":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1665 (cat,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1666 [('o', 'output', "", 'output to file')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1667 'hg cat [-o OUTFILE] FILE [REV]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1668 "^clone":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1669 (clone,
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1670 [('U', 'noupdate', None, 'skip update after cloning'),
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1671 ('e', 'ssh', "", 'ssh command'),
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1672 ('', 'remotecmd', "", 'remote hg command')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1673 'hg clone [OPTION]... SOURCE [DEST]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1674 "^commit\|ci":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1675 (commit,
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1676 [('A', 'addremove', None, 'run add/remove during commit'),
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1677 ('I', 'include', [], 'include path in search'),
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1678 ('X', 'exclude', [], 'exclude path from search'),
761 0fb498458905 Change all references to -t --text commit message to -m and --message. Andrew Thompson <andrewkt@aktzero.com> parents: 758 diff changeset	1679 ('m', 'message', "", 'commit message'),
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1680 ('t', 'text', "", 'commit message (deprecated: use -m)'),
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1681 ('l', 'logfile', "", 'commit message file'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1682 ('d', 'date', "", 'date code'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1683 ('u', 'user', "", 'user')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1684 'hg commit [OPTION]... [FILE]...'),
116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1685 "copy": (copy, [], 'hg copy SOURCE DEST'),
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1686 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
1028 25e7ea0f2cff Add commands.debugconfig. Bryan O'Sullivan <bos@serpentine.com> parents: 989 diff changeset	1687 "debugconfig": (debugconfig, [], 'debugconfig'),
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1688 "debugstate": (debugstate, [], 'debugstate'),
1039 4296754ba7b4 Add debugdata for dumping revlog revision data mpm@selenic.com parents: 1037 diff changeset	1689 "debugdata": (debugdata, [], 'debugdata FILE REV'),
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1690 "debugindex": (debugindex, [], 'debugindex FILE'),
116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1691 "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
1116 0cdd73b0767c Add some rename debugging support mpm@selenic.com parents: 1114 diff changeset	1692 "debugrename": (debugrename, [], 'debugrename FILE [REV]'),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1693 "debugwalk":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1694 (debugwalk,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1695 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1696 ('X', 'exclude', [], 'exclude path from search')],
913 46581ad4bd27 typo fix in command help text TK Soh <teekaysoh@yahoo.com> parents: 910 diff changeset	1697 'debugwalk [OPTION]... [FILE]...'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1698 "^diff":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1699 (diff,
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1700 [('r', 'rev', [], 'revision'),
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1701 ('a', 'text', None, 'treat all files as text'),
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1702 ('I', 'include', [], 'include path in search'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1703 ('X', 'exclude', [], 'exclude path from search')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1704 '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	1705 "^export":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1706 (export,
1015 22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1707 [('o', 'output', "", 'output to file'),
22571b8d35d3 Add automatic binary file detection to diff and export mpm@selenic.com parents: 1014 diff changeset	1708 ('a', 'text', None, 'treat all files as text')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1709 "hg export [-a] [-o OUTFILE] REV..."),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1710 "forget":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1711 (forget,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1712 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1713 ('X', 'exclude', [], 'exclude path from search')],
913 46581ad4bd27 typo fix in command help text TK Soh <teekaysoh@yahoo.com> parents: 910 diff changeset	1714 "hg forget [OPTION]... FILE..."),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1715 "grep":
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1716 (grep,
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1717 [('0', 'print0', None, 'end fields with NUL'),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1718 ('I', 'include', [], 'include path in search'),
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1719 ('X', 'exclude', [], 'include path in search'),
1212 ccb6201e3f28 Change grep -e to grep --all mpm@selenic.com parents: 1211 diff changeset	1720 ('', 'all', None, 'print all revisions with matches'),
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1721 ('i', 'ignore-case', None, 'ignore case when matching'),
1146 9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1722 ('l', 'files-with-matches', None, 'print names of files and revs with matches'),
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1723 ('n', 'line-number', None, 'print line numbers'),
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1724 ('r', 'rev', [], 'search in revision rev'),
9061f79c6c6f grep: extend functionality, add man page entry, add unit test. bos@serpentine.internal.keyresearch.com parents: 1145 diff changeset	1725 ('u', 'user', None, 'print user who made change')],
1108 7a75d8fbbdaf Remove some options from 'hg grep': Thomas Arendsen Hein <thomas@intevation.de> parents: 1106 diff changeset	1726 "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	1727 "heads":
65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	1728 (heads,
65763ff9fa53 Update online help of hg heads for new --branches option. Thomas Arendsen Hein <thomas@intevation.de> parents: 904 diff changeset	1729 [('b', 'branches', None, 'find branch info')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1730 'hg heads [-b]'),
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1731 "help": (help_, [], 'hg help [COMMAND]'),
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	1732 "identify\|id": (identify, [], 'hg identify'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1733 "import\|patch":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1734 (import_,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1735 [('p', 'strip', 1, 'path strip'),
966 022bcc738389 hg import: abort with uncommitted changes, override with --force mpm@selenic.com parents: 965 diff changeset	1736 ('f', 'force', None, 'skip check for outstanding changes'),
1211 1c455338ad95 Fold import -m option into import -f mpm@selenic.com parents: 1209 diff changeset	1737 ('b', 'base', "", 'base path')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1738 "hg import [-f] [-p NUM] [-b BASE] PATCH..."),
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1739 "incoming\|in": (incoming,
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1740 [('p', 'patch', None, 'show patch')],
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1741 'hg incoming [-p] [SOURCE]'),
907 652507dc9fce Modify init command to take an optional directory to set up. Bryan O'Sullivan <bos@serpentine.com> parents: 906 diff changeset	1742 "^init": (init, [], 'hg init [DEST]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1743 "locate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1744 (locate,
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1745 [('r', 'rev', '', 'revision'),
1113 6130de75bb2a Updated manpage and help. TK Soh <teekaysoh@yahoo.com> parents: 1109 diff changeset	1746 ('0', 'print0', None, 'end filenames with NUL'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1747 ('f', 'fullpath', None, 'print complete paths'),
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1748 ('I', 'include', [], 'include path in search'),
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	1749 ('X', 'exclude', [], 'exclude path from search')],
913 46581ad4bd27 typo fix in command help text TK Soh <teekaysoh@yahoo.com> parents: 910 diff changeset	1750 'hg locate [OPTION]... [PATTERN]...'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1751 "^log\|history":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1752 (log,
1031 503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1753 [('I', 'include', [], 'include path in search'),
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1754 ('X', 'exclude', [], 'exclude path from search'),
503aaf19a040 Rewrite log command. New version is faster and more featureful. Bryan O'Sullivan <bos@serpentine.com> parents: 1030 diff changeset	1755 ('r', 'rev', [], 'revision'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1756 ('p', 'patch', None, 'show patch')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1757 'hg log [-I] [-X] [-r REV]... [-p] [FILE]'),
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1758 "manifest": (manifest, [], 'hg manifest [REV]'),
1192 6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1759 "outgoing\|out": (outgoing,
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1760 [('p', 'patch', None, 'show patch')],
6e165de907c5 Add -p to incoming and outgoing commands to show patch TK Soh <teekaysoh@yahoo.com> parents: 1191 diff changeset	1761 'hg outgoing [-p] [DEST]'),
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1762 "parents": (parents, [], 'hg parents [REV]'),
924 ab681ea2857e updated help text and added manpage section for hg paths TK Soh <teekaysoh@yahoo.com> parents: 921 diff changeset	1763 "paths": (paths, [], 'hg paths [NAME]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1764 "^pull":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1765 (pull,
963 84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1766 [('u', 'update', None, 'update working directory'),
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1767 ('e', 'ssh', "", 'ssh command'),
84355e3e4493 Add -e and --remotecmd for clone and pull too mpm@selenic.com parents: 961 diff changeset	1768 ('', 'remotecmd', "", 'remote hg command')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1769 'hg pull [-u] [-e FILE] [--remotecmd FILE] [SOURCE]'),
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1770 "^push":
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1771 (push,
961 3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1772 [('f', 'force', None, 'force push'),
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1773 ('e', 'ssh', "", 'ssh command'),
3e11d5038649 Add --ssh and --remotecmd to push mpm@selenic.com parents: 955 diff changeset	1774 ('', 'remotecmd', "", 'remote hg command')],
1054 5139ee9bfc38 Fixed some synopsises in command help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1053 diff changeset	1775 'hg push [-f] [-e FILE] [--remotecmd FILE] [DEST]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1776 "rawcommit":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1777 (rawcommit,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1778 [('p', 'parent', [], 'parent'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1779 ('d', 'date', "", 'date code'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1780 ('u', 'user', "", 'user'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1781 ('F', 'files', "", 'file list'),
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1782 ('m', 'message', "", 'commit message'),
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1783 ('t', 'text', "", 'commit message (deprecated: use -m)'),
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1784 ('l', 'logfile', "", 'commit message file')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1785 'hg rawcommit [OPTION]... [FILE]...'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1786 "recover": (recover, [], "hg recover"),
1188 b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1787 "^remove\|rm": (remove,
b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1788 [('I', 'include', [], 'include path in search'),
b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1789 ('X', 'exclude', [], 'exclude path from search')],
b3ceb2d470fc Fix up remove command to use walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 1187 diff changeset	1790 "hg remove [OPTION]... FILE..."),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1791 "^revert":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1792 (revert,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1793 [("n", "nonrecursive", None, "don't recurse into subdirs"),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1794 ("r", "rev", "", "revision")],
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1795 "hg revert [-n] [-r REV] [NAME]..."),
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1796 "root": (root, [], "hg root"),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1797 "^serve":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1798 (serve,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1799 [('A', 'accesslog', '', 'access log file'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1800 ('E', 'errorlog', '', 'error log file'),
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 931 diff changeset	1801 ('p', 'port', 0, 'listen port'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1802 ('a', 'address', '', 'interface address'),
938 54b2a42e501e hgweb: add [web] section to hgrc mpm@selenic.com parents: 931 diff changeset	1803 ('n', 'name', "", 'repository name'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1804 ('', 'stdio', None, 'for remote clients'),
987 bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1805 ('t', 'templates', "", 'template directory'),
bfe12654764d hgweb: change startup argument processing mpm@selenic.com parents: 981 diff changeset	1806 ('', 'style', "", 'template style'),
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 824 diff changeset	1807 ('6', 'ipv6', None, 'use IPv6 in addition to IPv4')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1808 "hg serve [OPTION]..."),
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1809 "^status":
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1810 (status,
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1811 [('m', 'modified', None, 'show only modified files'),
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1812 ('a', 'added', None, 'show only added files'),
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1813 ('r', 'removed', None, 'show only removed files'),
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1814 ('u', 'unknown', None, 'show only unknown (not tracked) files'),
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	1815 ('n', 'no-status', None, 'hide status prefix'),
1113 6130de75bb2a Updated manpage and help. TK Soh <teekaysoh@yahoo.com> parents: 1109 diff changeset	1816 ('0', 'print0', None, 'end filenames with NUL'),
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1817 ('I', 'include', [], 'include path in search'),
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1818 ('X', 'exclude', [], 'exclude path from search')],
913 46581ad4bd27 typo fix in command help text TK Soh <teekaysoh@yahoo.com> parents: 910 diff changeset	1819 "hg status [OPTION]... [FILE]..."),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1820 "tag":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1821 (tag,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1822 [('l', 'local', None, 'make the tag local'),
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1823 ('m', 'message', "", 'commit message'),
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1824 ('t', 'text', "", 'commit message (deprecated: use -m)'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1825 ('d', 'date', "", 'date code'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1826 ('u', 'user', "", 'user')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1827 'hg tag [OPTION]... NAME [REV]'),
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1828 "tags": (tags, [], 'hg tags'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1829 "tip": (tip, [], 'hg tip'),
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1830 "unbundle":
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1831 (unbundle,
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1832 [],
cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1215 diff changeset	1833 'hg unbundle FILE'),
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	1834 "undo": (undo, [], 'hg undo'),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	1835 "^update\|up\|checkout\|co":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1836 (update,
898 3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1837 [('b', 'branch', "", 'checkout the head of a specific branch'),
3616c0d7ab88 Add searching for named branches mason@suse.com parents: 896 diff changeset	1838 ('m', 'merge', None, 'allow merging of conflicts'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1839 ('C', 'clean', None, 'overwrite locally modified files')],
906 c711930cf15d Update synopsis for 'hg update', too. Thomas Arendsen Hein <thomas@intevation.de> parents: 905 diff changeset	1840 'hg update [-b TAG] [-m] [-C] [REV]'),
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1841 "verify": (verify, [], 'hg verify'),
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	1842 "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	1843 }
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1844
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1845 globalopts = [
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1846 ('R', 'repository', "", 'repository root directory'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1847 ('', 'cwd', '', 'change working directory'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1848 ('y', 'noninteractive', None, 'run non-interactively'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1849 ('q', 'quiet', None, 'quiet mode'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1850 ('v', 'verbose', None, 'verbose mode'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1851 ('', 'debug', None, 'debug mode'),
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	1852 ('', 'debugger', None, 'start debugger'),
1046 772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1853 ('', 'traceback', None, 'print traceback on exception'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1854 ('', 'time', None, 'time how long the command takes'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1855 ('', 'profile', None, 'profile'),
772507daaa17 Sort global options by topic: directories, ui, timing, other Thomas Arendsen Hein <thomas@intevation.de> parents: 1044 diff changeset	1856 ('', 'version', None, 'output version information and exit'),
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	1857 ('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	1858 ]
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1859
1065 6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1860 norepo = ("clone init version help debugconfig debugdata"
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	1861 " debugindex debugindexdot paths")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1862
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1863 def find(cmd):
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1864 for e in table.keys():
335 74b9332faece Fix misrecognition of commands mpm@selenic.com parents: 333 diff changeset	1865 if re.match("(%s)$" % e, cmd):
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	1866 return e, table[e]
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1867
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1868 raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1869
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1870 class SignalInterrupt(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1871 """Exception raised on SIGTERM and SIGHUP."""
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1872
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1873 def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1874 raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1875
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1876 def run():
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1877 sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1878
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1879 class ParseError(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1880 """Exception raised on errors in parsing the command line."""
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1881
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1882 def parse(args):
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1883 options = {}
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1884 cmdoptions = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1885
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1886 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1887 args = fancyopts.fancyopts(args, globalopts, options)
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1888 except fancyopts.getopt.GetoptError, inst:
618 4051b78c53c7 Handle unrecognised options correctly. Bryan O'Sullivan <bos@serpentine.com> parents: 617 diff changeset	1889 raise ParseError(None, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1890
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	1891 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	1892 cmd, args = args[0], args[1:]
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	1893 i = find(cmd)[1]
a0538ea1ac50 Moved special handling of --version and no hg command from parse to dispatch. Thomas Arendsen Hein <thomas@intevation.de> parents: 1046 diff changeset	1894 c = list(i[1])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1895 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	1896 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	1897 c = []
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1898
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1899 # combine global options into local
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1900 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1901 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	1902
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	1903 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1904 args = fancyopts.fancyopts(args, c, cmdoptions)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	1905 except fancyopts.getopt.GetoptError, inst:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1906 raise ParseError(cmd, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1907
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1908 # separate global options back out
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1909 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1910 n = o[1]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1911 options[n] = cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1912 del cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1913
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	1914 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	1915
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1916 def dispatch(args):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1917 signal.signal(signal.SIGTERM, catchterm)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1918 try:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1919 signal.signal(signal.SIGHUP, catchterm)
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1920 except AttributeError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1921 pass
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1922
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1923 u = ui.ui()
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1924 external = []
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1925 for x in u.extensions():
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1926 if x[1]:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1927 mod = imp.load_source(x[0], x[1])
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1928 else:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1929 def importh(name):
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1930 mod = __import__(name)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1931 components = name.split('.')
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1932 for comp in components[1:]:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1933 mod = getattr(mod, comp)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1934 return mod
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1935 mod = importh(x[0])
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1936 external.append(mod)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1937 for x in external:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1938 for t in x.cmdtable:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1939 if t in table:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1940 u.warn("module %s override %s\n" % (x.__name__, t))
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1941 table.update(x.cmdtable)
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1942
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1943 try:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1944 cmd, func, args, options, cmdoptions = parse(args)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1945 except ParseError, inst:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1946 if inst.args[0]:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1947 u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1948 help_(u, inst.args[0])
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1949 else:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1950 u.warn("hg: %s\n" % inst.args[1])
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	1951 help_(u, 'shortlist')
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1952 sys.exit(-1)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1953 except UnknownCommand, inst:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1954 u.warn("hg: unknown command '%s'\n" % inst.args[0])
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	1955 help_(u, 'shortlist')
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1956 sys.exit(1)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1957
783 4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1958 if options["time"]:
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1959 def get_times():
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1960 t = os.times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1961 if t[4] == 0.0: # Windows leaves this as zero, so use time.clock()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1962 t = (t[0], t[1], t[2], t[3], time.clock())
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1963 return t
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1964 s = get_times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1965 def print_time():
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1966 t = get_times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1967 u.warn("Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" %
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1968 (t[4]-s[4], t[0]-s[0], t[2]-s[2], t[1]-s[1], t[3]-s[3]))
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1969 atexit.register(print_time)
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1970
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	1971 u.updateopts(options["verbose"], options["debug"], options["quiet"],
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1972 not options["noninteractive"])
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1973
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	1974 # enter the debugger before command execution
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	1975 if options['debugger']:
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	1976 pdb.set_trace()
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	1977
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	1978 try:
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1979 try:
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	1980 if options['help']:
1049 160a68cd393f Allow --help and --version being used together. Thomas Arendsen Hein <thomas@intevation.de> parents: 1048 diff changeset	1981 help_(u, cmd, options['version'])
1048 7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	1982 sys.exit(0)
7fbb440b2e63 Added options -h/--help. Thomas Arendsen Hein <thomas@intevation.de> parents: 1047 diff changeset	1983 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	1984 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	1985 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	1986 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	1987 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	1988 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	1989
1050 9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1990 if options['cwd']:
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1991 try:
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1992 os.chdir(options['cwd'])
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1993 except OSError, inst:
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1994 u.warn('abort: %s: %s\n' % (options['cwd'], inst.strerror))
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1995 sys.exit(1)
9c09094de48c Moved --cwd handling to a place where ui and exception handling already exists. Thomas Arendsen Hein <thomas@intevation.de> parents: 1049 diff changeset	1996
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1997 if cmd not in norepo.split():
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1998 path = options["repository"] or ""
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1999 repo = hg.repository(ui=u, path=path)
1071 8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2000 for x in external:
8f0ac653f85e Add support for extension modules mason@suse.com parents: 1068 diff changeset	2001 x.reposetup(u, repo)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2002 d = lambda: func(u, repo, args, *cmdoptions)
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2003 else:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2004 d = lambda: func(u, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2005
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2006 if options['profile']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2007 import hotshot, hotshot.stats
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2008 prof = hotshot.Profile("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2009 r = prof.runcall(d)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2010 prof.close()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2011 stats = hotshot.stats.load("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2012 stats.strip_dirs()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2013 stats.sort_stats('time', 'calls')
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2014 stats.print_stats(40)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2015 return r
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2016 else:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2017 return d()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2018 except:
1225 ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2019 # enter the debugger when we hit an exception
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2020 if options['debugger']:
ea90162e210c Add --debugger global option mpm@selenic.com parents: 1222 diff changeset	2021 pdb.post_mortem(sys.exc_info()[2])
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2022 if options['traceback']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2023 traceback.print_exc()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	2024 raise
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	2025 except hg.RepoError, inst:
81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	2026 u.warn("abort: ", inst, "!\n")
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1212 diff changeset	2027 except revlog.RevlogError, inst:
34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1212 diff changeset	2028 u.warn("abort: ", inst, "!\n")
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2029 except SignalInterrupt:
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	2030 u.warn("killed!\n")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	2031 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	2032 try:
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	2033 u.warn("interrupted!\n")
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	2034 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	2035 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	2036 if u.debugflag:
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	2037 u.warn("\nbroken pipe\n")
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	2038 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	2039 raise
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	2040 except IOError, inst:
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2041 if hasattr(inst, "code"):
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2042 u.warn("abort: %s\n" % inst)
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2043 elif hasattr(inst, "reason"):
773 d77c1031fd17 Hide errno in abort messages mpm@selenic.com parents: 771 diff changeset	2044 u.warn("abort: error: %s\n" % inst.reason[1])
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	2045 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	2046 if u.debugflag:
6e94c0365d98 Cleanups to commands.py Thomas Arendsen Hein <thomas@intevation.de> parents: 1062 diff changeset	2047 u.warn("broken pipe\n")
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	2048 else:
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	2049 raise
549 92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2050 except OSError, inst:
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2051 if hasattr(inst, "filename"):
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2052 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2053 else:
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	2054 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	2055 except util.Abort, inst:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	2056 u.warn('abort: ', inst.args[0] % inst.args[1:], '\n')
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	2057 sys.exit(1)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2058 except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2059 # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2060 tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2061 if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	2062 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	2063 u.debug(inst, "\n")
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	2064 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	2065 help_(u, cmd)
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2066 except UnknownCommand, inst:
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2067 u.warn("hg: unknown command '%s'\n" % inst.args[0])
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	2068 help_(u, 'shortlist')
1215 8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2069 except SystemExit:
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2070 # don't catch this is the catch-all below
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2071 raise
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2072 except:
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2073 u.warn("** unknown exception encountered, details follow\n")
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2074 u.warn("** report bug details to mercurial@selenic.com\n")
8b4435aae40a Add reporting instructions to unknown exception backtraces mpm@selenic.com parents: 1214 diff changeset	2075 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	2076
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	2077 sys.exit(-1)

Mercurial > public > mercurial-scm > hg

annotate mercurial/commands.py @ 1225:ea90162e210c