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

annotate mercurial/commands.py @ 1057:2fd15d743b3b

Add grep command. It currently searches all revs of every matching file. I'll change this soon so that it can still do this, but it will not be the default behaviour. Many options are unimplemented. There's only one output mode. Binary files are not handled yet.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Thu, 25 Aug 2005 02:00:03 -0700
parents	23f9d71ab9ae
children	402279974aea

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

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/commands.py @ 1057:2fd15d743b3b