mercurial-crew-with-dirclash: mercurial/commands.py annotate

annotate mercurial/commands.py @ 859:6390c377a9e6

Trap OSError when deleting env vars On the other OS, it seems that case insensitivity for environment vars can bite users when using some unknown combination of python 2.4.1 and win2kSP4+minsys (and probably other vversions of these softwares). The best way to avoid problems in those weird cases is to ignore OSError exception during env var deletion.

author	Edouard Gomez <ed.gomez@free.fr>
date	Tue, 09 Aug 2005 09:36:34 -0800
parents	1df0983eb589
children	c2e77581bc84 9a0af739cf55 bc9ca4d51d23 62ec665759f2 01215ad04283

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")
613 5374955ec5b1 Demand-load most modules in the commands and ui modules. Bryan O'Sullivan <bos@serpentine.com> parents: 612 diff changeset	10 demandload(globals(), "fancyopts ui hg util")
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
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	17 class Abort(Exception):
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	18 """Raised if a command needs to print an error and exit."""
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	19
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	20 def filterfiles(filters, files):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	21 l = [x for x in files if x in filters]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	22
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	23 for t in filters:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	24 if t and t[-1] != "/":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	25 t += "/"
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	26 l += [x for x in files if x.startswith(t)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	27 return l
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	28
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	29 def relfilter(repo, files):
628 8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	30 cwd = repo.getcwd()
8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	31 if cwd:
8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	32 return filterfiles([util.pconvert(cwd)], files)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	33 return files
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	34
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	35 def relpath(repo, args):
628 8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	36 cwd = repo.getcwd()
8d7f6e68828a Use repo.getcwd() in a few obvious places. Bryan O'Sullivan <bos@serpentine.com> parents: 627 diff changeset	37 if cwd:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	38 return [util.pconvert(os.path.normpath(os.path.join(cwd, x)))
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	39 for x in args]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	40 return args
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	41
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	42 def matchpats(cwd, pats = [], opts = {}, head = ''):
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	43 return util.matcher(cwd, pats or ['.'], opts.get('include'),
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	44 opts.get('exclude'), head)
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	45
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	46 def pathto(n1, n2):
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	47 '''return the relative path from one place to another'''
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	48 if not n1: return n2
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	49 a, b = n1.split(os.sep), n2.split(os.sep)
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	50 a.reverse(), b.reverse()
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	51 while a and b and a[-1] == b[-1]:
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	52 a.pop(), b.pop()
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	53 b.reverse()
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	54 return os.sep.join((['..'] * len(a)) + b)
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	55
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	56 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	57 cwd = repo.getcwd()
812 b65af904d6d7 Reduce the amount of stat traffic generated by a walk. Bryan O'Sullivan <bos@serpentine.com> parents: 810 diff changeset	58 files, matchfn = matchpats(cwd, pats, opts, head)
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	59 def walk():
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	60 for src, fn in repo.walk(files = files, match = matchfn):
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	61 yield src, fn, pathto(cwd, fn)
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	62 return files, matchfn, walk()
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	63
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	64 def walk(repo, pats, opts, head = ''):
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	65 files, matchfn, results = makewalk(repo, pats, opts, head)
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	66 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	67
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	68 revrangesep = ':'
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	69
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	70 def revrange(ui, repo, revs, revlog=None):
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	71 if revlog is None:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	72 revlog = repo.changelog
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	73 revcount = revlog.count()
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	74 def fix(val, defval):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	75 if not val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	76 return defval
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	77 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	78 num = int(val)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	79 if str(num) != val:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	80 raise ValueError
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	81 if num < 0:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	82 num += revcount
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	83 if not (0 <= num < revcount):
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	84 raise ValueError
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	85 except ValueError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	86 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	87 num = repo.changelog.rev(repo.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	88 except KeyError:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	89 try:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	90 num = revlog.rev(revlog.lookup(val))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	91 except KeyError:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	92 raise Abort('invalid revision identifier %s', val)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	93 return num
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	94 for spec in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	95 if spec.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	96 start, end = spec.split(revrangesep, 1)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	97 start = fix(start, 0)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	98 end = fix(end, revcount - 1)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	99 if end > start:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	100 end += 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	101 step = 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	102 else:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	103 end -= 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	104 step = -1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	105 for rev in xrange(start, end, step):
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	106 yield str(rev)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	107 else:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	108 yield spec
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	109
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	110 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	111 total=None, seqno=None, revwidth=None):
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	112 node_expander = {
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	113 'H': lambda: hg.hex(node),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	114 'R': lambda: str(r.rev(node)),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	115 'h': lambda: hg.short(node),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	116 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	117 expander = {
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	118 '%': lambda: '%',
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	119 'b': lambda: os.path.basename(repo.root),
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	120 }
8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	121
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	122 try:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	123 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	124 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	125 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	126 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	127 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	128 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	129 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	130 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	131 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	132 expander['n'] = lambda:str(seqno).zfill(len(str(total)))
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	133
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	134 newname = []
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	135 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	136 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	137 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	138 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	139 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	140 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	141 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	142 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	143 newname.append(c)
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	144 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	145 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	146 except KeyError, inst:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	147 raise Abort("invalid format spec '%%%s' in output file name",
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	148 inst.args[0])
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	149
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	150 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	151 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	152 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	153 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	154 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	155 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	156 return pat
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	157 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	158 return pat
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	159 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	160 mode)
36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	161
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	162 def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	163 def date(c):
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	164 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	165
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	166 (c, a, d, u) = repo.changes(node1, node2, files, match = match)
537 411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	167 if files:
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	168 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	169
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	170 if not c and not a and not d:
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	171 return
411e05b04ffa Propagate file list through dodiff mpm@selenic.com parents: 536 diff changeset	172
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	173 if node2:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	174 change = repo.changelog.read(node2)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	175 mmap2 = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	176 date2 = date(change)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	177 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	178 return repo.file(f).read(mmap2[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	179 else:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	180 date2 = time.asctime()
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	181 if not node1:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	182 node1 = repo.dirstate.parents()[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	183 def read(f):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	184 return repo.wfile(f).read()
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	185
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	186 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	187 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	188 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	189 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	190 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	191
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	192 change = repo.changelog.read(node1)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	193 mmap = repo.manifest.read(change[0])
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	194 date1 = date(change)
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	195
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	196 for f in c:
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	197 to = None
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	198 if f in mmap:
61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	199 to = repo.file(f).read(mmap[f])
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	200 tn = read(f)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	201 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	202 for f in a:
264 4c1d7072d5cd Attempt to make diff deal with null sources properly mpm@selenic.com parents: 262 diff changeset	203 to = None
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	204 tn = read(f)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	205 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	206 for f in d:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	207 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	208 tn = None
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	209 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r))
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	210
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	211 def show_changeset(ui, repo, rev=0, changenode=None, filelog=None):
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	212 """show a single changeset or file revision"""
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	213 changelog = repo.changelog
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	214 if filelog:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	215 log = filelog
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	216 filerev = rev
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	217 node = filenode = filelog.node(filerev)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	218 changerev = filelog.linkrev(filenode)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	219 changenode = changenode or changelog.node(changerev)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	220 else:
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	221 log = changelog
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	222 changerev = rev
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	223 if changenode is None:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	224 changenode = changelog.node(changerev)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	225 elif not changerev:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	226 rev = changerev = changelog.rev(changenode)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	227 node = changenode
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	228
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	229 if ui.quiet:
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	230 ui.write("%d:%s\n" % (rev, hg.hex(node)))
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	231 return
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	232
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	233 changes = changelog.read(changenode)
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	234
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	235 parents = [(log.rev(p), ui.verbose and hg.hex(p) or hg.short(p))
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	236 for p in log.parents(node)
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	237 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	238 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	239 parents = []
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	240
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	241 if ui.verbose:
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	242 ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode)))
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	243 else:
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	244 ui.write("changeset: %d:%s\n" % (changerev, hg.short(changenode)))
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	245
687 44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	246 for tag in repo.nodetags(changenode):
44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	247 ui.status("tag: %s\n" % tag)
44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	248 for parent in parents:
44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	249 ui.write("parent: %d:%s\n" % parent)
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	250 if filelog:
687 44b30755d07c Hide file hashes in log Matt Mackall <mpm@selenic.com> parents: 678 diff changeset	251 ui.debug("file rev: %d:%s\n" % (filerev, hg.hex(filenode)))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	252
d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	253 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	254 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	255 ui.status("user: %s\n" % changes[1])
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	256 ui.status("date: %s\n" % time.asctime(
67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	257 time.localtime(float(changes[2].split(' ')[0]))))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	258
493 30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	259 if ui.debugflag:
536 c15b4bc0a11c Refactor diffrevs/diffdir into changes mpm@selenic.com parents: 535 diff changeset	260 files = repo.changes(changelog.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	261 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	262 if value:
df9b77f67998 Make show_changeset show added and deleted files in verbose mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	263 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	264 else:
30752b14f759 Make show_changeset show added/deleted files only in debug mode. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	265 ui.note("files: %s\n" % " ".join(changes[3]))
778 d09975474928 Shorten hashes displayed in log mpm@selenic.com parents: 773 diff changeset	266
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	267 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	268 if description:
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	269 if ui.verbose:
27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	270 ui.status("description:\n")
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	271 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	272 ui.status("\n\n")
330 27d08c0c2a7e Merge with TAH mpm@selenic.com parents: 320 329 diff changeset	273 else:
347 a0b2758edee7 Cleaned up show_changeset() Thomas Arendsen Hein <thomas@intevation.de> parents: 330 diff changeset	274 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	275 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	276
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	277 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	278 """output version and copyright information"""
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	279 ui.write("Mercurial Distributed SCM (version %s)\n"
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	280 % 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	281 ui.status(
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	282 "\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	283 "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	284 "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	285 "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	286 )
25afb21d97ba Support for 'hg --version'. setup.py stores version from hg repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 396 diff changeset	287
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	288 def help_(ui, cmd=None):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	289 """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	290 if cmd and cmd != 'shortlist':
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	291 key, i = find(cmd)
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	292 # synopsis
848 221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	293 ui.write("%s\n\n" % i[2])
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	294
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	295 # description
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	296 doc = i[0].__doc__
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	297 if ui.quiet:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	298 doc = doc.splitlines(0)[0]
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	299 ui.write("%s\n" % doc.rstrip())
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	300
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	301 # aliases
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	302 if not ui.quiet:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	303 aliases = ', '.join(key.split('\|')[1:])
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	304 if aliases:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	305 ui.write("\naliases: %s\n" % aliases)
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	306
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	307 # options
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	308 if not ui.quiet and i[1]:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	309 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	310 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	311 opt = ' '
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	312 if s:
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	313 opt = opt + '-' + s + ' '
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	314 if l:
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	315 opt = opt + '--' + l + ' '
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	316 if d:
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	317 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	318 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	319 if c:
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	320 ui.write(' %s\n' % c)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	321
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	322 else:
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	323 # program name
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	324 if ui.verbose:
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	325 show_version(ui)
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	326 else:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	327 ui.status("Mercurial Distributed SCM\n")
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	328 ui.status('\n')
843 859e7ea530bd 'hg help -v' shows global options kreijack@inwind.REMOVEME.it parents: 842 diff changeset	329
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	330 # 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	331 if cmd == "shortlist":
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	332 ui.status('basic commands (use "hg help" '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	333 '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	334 elif ui.verbose:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	335 ui.status('list of commands:\n\n')
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	336 else:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	337 ui.status('list of commands (use "hg help -v" '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	338 'to show aliases and global options):\n\n')
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	339
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	340 h = {}
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	341 cmds = {}
479 7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	342 for c, e in table.items():
7293cb91bf2a Cleaned up command alias handling in help. Thomas Arendsen Hein <thomas@intevation.de> parents: 477 diff changeset	343 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	344 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	345 continue
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	346 f = f.lstrip("^")
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	347 if not ui.debugflag and f.startswith("debug"):
ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	348 continue
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	349 d = ""
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	350 if e[0].__doc__:
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	351 d = e[0].__doc__.splitlines(0)[0].rstrip()
0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	352 h[f] = d
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	353 cmds[f]=c.lstrip("^")
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	354
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	355 fns = h.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	356 fns.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	357 m = max(map(len, fns))
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	358 for f in fns:
844 5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	359 if ui.verbose:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	360 commands = cmds[f].replace("\|",", ")
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	361 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	362 else:
5a717cfa7406 'hg help -v' mentions the alias of the commands kreijack@inwind.REMOVEME.it parents: 843 diff changeset	363 ui.write(' %-*s %s\n' % (m, f, h[f]))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	364
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	365 # global options
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	366 if ui.verbose:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	367 ui.write("\nglobal options:\n\n")
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	368 for s, l, d, c in globalopts:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	369 opt = ' '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	370 if s:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	371 opt = opt + '-' + s + ' '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	372 if l:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	373 opt = opt + '--' + l + ' '
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	374 if d:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	375 opt = opt + '(' + str(d) + ')'
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	376 ui.write(opt, "\n")
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	377 if c:
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	378 ui.write(' %s\n' % c)
8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	379
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	380 # Commands start here, listed alphabetically
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	381
724 1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	382 def add(ui, repo, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	383 '''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	384 names = []
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	385 q = dict(zip(pats, pats))
726 809a870a0e73 Add a source designator to the walk methods. Bryan O'Sullivan <bos@serpentine.com> parents: 725 diff changeset	386 for src, abs, rel 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	387 if rel in q or abs in q:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	388 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	389 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	390 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	391 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	392 repo.add(names)
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	393
766 b444a7e053f1 Get addremove to use new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 764 diff changeset	394 def addremove(ui, repo, pats, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	395 """add all new files, delete all missing files"""
766 b444a7e053f1 Get addremove to use new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 764 diff changeset	396 q = dict(zip(pats, pats))
809 d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	397 add, remove = [], []
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	398 for src, abs, rel in walk(repo, pats, opts):
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	399 if src == 'f':
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	400 if repo.dirstate.state(abs) == '?':
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	401 add.append(abs)
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	402 if rel not in q: ui.status('adding ', rel, '\n')
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	403 elif repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	404 remove.append(abs)
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	405 if rel not in q: ui.status('removing ', rel, '\n')
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	406 repo.add(add)
d0fb9efa2b2d Fix performance regression in addremove command. Bryan O'Sullivan <bos@serpentine.com> parents: 783 diff changeset	407 repo.remove(remove)
219 8ff4532376a4 hg checkout: refuse to checkout if there are outstanding changes mpm@selenic.com parents: 214 diff changeset	408
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	409 def annotate(ui, repo, pats, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	410 """show changeset information per file line"""
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	411 def getnode(rev):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	412 return hg.short(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	413
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	414 def getname(rev):
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	415 try:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	416 return bcache[rev]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	417 except KeyError:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	418 cl = repo.changelog.read(repo.changelog.node(rev))
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	419 name = cl[1]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	420 f = name.find('@')
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	421 if f >= 0:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	422 name = name[:f]
534 ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 532 diff changeset	423 f = name.find('<')
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 532 diff changeset	424 if f >= 0:
ab0d1bfeee7c [PATCH] Handle 'name firstname <email@server>' correctly in annotate mpm@selenic.com parents: 532 diff changeset	425 name = name[f+1:]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	426 bcache[rev] = name
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	427 return name
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	428
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	429 if not pats:
3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	430 raise Abort('at least one file name or pattern required')
3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	431
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	432 bcache = {}
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	433 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	434 if not opts['user'] and not opts['changeset']:
29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	435 opts['number'] = 1
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	436
715 938dd667ca21 Make annotate use option --rev instead od --revision like other commands. Thomas Arendsen Hein <thomas@intevation.de> parents: 714 diff changeset	437 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	438 node = repo.changelog.lookup(opts['rev'])
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	439 else:
29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	440 node = repo.dirstate.parents()[0]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	441 change = repo.changelog.read(node)
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	442 mmap = repo.manifest.read(change[0])
744 3d88f6dd1ed4 Handle empty file list for annotate mpm@selenic.com parents: 743 diff changeset	443 for src, abs, rel in walk(repo, pats, opts):
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	444 if abs not in mmap:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	445 ui.warn("warning: %s is not in the repository!\n" % rel)
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	446 continue
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	447
733 1966c553f652 Convert annotate over to walk interface. Bryan O'Sullivan <bos@serpentine.com> parents: 732 diff changeset	448 lines = repo.file(abs).annotate(mmap[abs])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	449 pieces = []
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	450
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	451 for o, f in opmap:
714 29fcd195e056 Some cleanups in commands.annotate(). Thomas Arendsen Hein <thomas@intevation.de> parents: 712 diff changeset	452 if opts[o]:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	453 l = [f(n) for n, dummy in lines]
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	454 if l:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	455 m = max(map(len, l))
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	456 pieces.append(["%*s" % (m, x) for x in l])
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	457
771 0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	458 if pieces:
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	459 for p, l in zip(zip(*pieces), lines):
0de223012086 Fixes for annotate mpm@selenic.com parents: 770 diff changeset	460 ui.write("%s: %s" % (" ".join(p), l[1]))
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	461
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	462 def cat(ui, repo, file1, rev=None, **opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	463 """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	464 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	465 if rev:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	466 n = r.lookup(rev)
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	467 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	468 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	469 fp = make_file(repo, r, opts['output'], node=n)
632 8b8f710bb658 Provides output option to cat command thananck@yahoo.com parents: 630 diff changeset	470 fp.write(r.read(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	471
698 df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	472 def clone(ui, source, dest=None, **opts):
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	473 """make a copy of an existing repository"""
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	474 if dest is None:
528 648386fabf9c Fix clone bug wth trailing slash mpm@selenic.com parents: 527 diff changeset	475 dest = os.path.basename(os.path.normpath(source))
532 2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	476
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	477 if os.path.exists(dest):
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	478 ui.warn("abort: destination '%s' already exists\n" % dest)
2e9698a5c92c clone: abort on pre-existing destination directory mpm@selenic.com parents: 528 diff changeset	479 return 1
523 003df62ae39f [PATCH] Force "hg clone" to always create a new directory mpm@selenic.com parents: 522 diff changeset	480
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	481 class Dircleanup:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	482 def __init__(self, dir_):
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	483 self.rmtree = shutil.rmtree
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	484 self.dir_ = dir_
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	485 os.mkdir(dir_)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	486 def close(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	487 self.dir_ = None
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	488 def __del__(self):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	489 if self.dir_:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	490 self.rmtree(self.dir_, True)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	491
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	492 d = Dircleanup(dest)
562 be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc mpm@selenic.com parents: 561 diff changeset	493 abspath = source
634 da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 632 diff changeset	494 source = ui.expandpath(source)
da5378d39269 Add a repo method to report repo device Matt Mackall <mpm@selenic.com> parents: 632 diff changeset	495 other = hg.repository(ui, source)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	496
675 49de76abc4da hg clone stored path fix Mikael Berthe <mikael@lilotux.net> parents: 674 diff changeset	497 if other.dev() != -1:
49de76abc4da hg clone stored path fix Mikael Berthe <mikael@lilotux.net> parents: 674 diff changeset	498 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	499 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	500 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	501 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	502 ui.note("cloning by hardlink\n")
df78d8ccac4c Use python function instead of external 'cp' command when cloning repos. Thomas Arendsen Hein <thomas@intevation.de> parents: 697 diff changeset	503 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	504 copyfile)
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	505 try:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	506 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	507 except OSError:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	508 pass
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	509
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	510 repo = hg.repository(ui, dest)
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	511
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	512 else:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	513 repo = hg.repository(ui, dest, create=1)
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	514 repo.pull(other)
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	515
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	516 f = repo.opener("hgrc", "w")
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	517 f.write("[paths]\n")
562 be6233a2bfdd hg clone: only use the absolute path for .hg/hgrc mpm@selenic.com parents: 561 diff changeset	518 f.write("default = %s\n" % abspath)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	519
535 fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	520 if not opts['noupdate']:
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	521 update(ui, repo)
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	522
fba26990604a Deal with failed clone/transaction interaction mpm@selenic.com parents: 534 diff changeset	523 d.close()
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 513 diff changeset	524
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	525 def commit(ui, repo, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	526 """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	527 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	528 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	529 " 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	530 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	531 logfile = opts['logfile']
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	532 if not message and logfile:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	533 try:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	534 message = open(logfile).read()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	535 except IOError, why:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	536 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	537
354 e3667e3a18ac hg commit: add -A flag mpm@selenic.com parents: 353 diff changeset	538 if opts['addremove']:
813 80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	539 addremove(ui, repo, pats, *opts)
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	540 cwd = repo.getcwd()
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	541 if not pats and cwd:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	542 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	543 opts['exclude'] = [os.path.join(cwd, x) for x in opts['exclude']]
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	544 fns, match = matchpats((pats and repo.getcwd()) or '', pats, opts)
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	545 if pats:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	546 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	547 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	548 else:
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	549 files = []
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	550 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	551
363 ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	552 def copy(ui, repo, source, dest):
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	553 """mark a file as copied or renamed for the next commit"""
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	554 return repo.copy(*relpath(repo, (source, dest)))
ae96b7e1318d Add hg copy mpm@selenic.com parents: 355 diff changeset	555
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	556 def debugcheckstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	557 """validate the correctness of the current dirstate"""
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	558 parent1, parent2 = repo.dirstate.parents()
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	559 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	560 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	561 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	562 keys.sort()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	563 m1n = repo.changelog.read(parent1)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	564 m2n = repo.changelog.read(parent2)[0]
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	565 m1 = repo.manifest.read(m1n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	566 m2 = repo.manifest.read(m2n)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	567 errors = 0
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	568 for f in dc:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	569 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	570 if state in "nr" and f not in m1:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	571 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	572 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	573 if state in "a" and f in m1:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	574 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	575 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	576 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	577 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	578 (f, state))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	579 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	580 for f in m1:
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	581 state = repo.dirstate.state(f)
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	582 if state not in "nrm":
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	583 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	584 errors += 1
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	585 if errors:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	586 raise Abort(".hg/dirstate inconsistent with current parent's manifest")
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	587
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	588 def debugstate(ui, repo):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	589 """show the contents of the current dirstate"""
555 39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	590 repo.dirstate.read()
39a1cfb03ebd Unbreak dirstate debug commands mpm@selenic.com parents: 554 diff changeset	591 dc = repo.dirstate.map
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	592 keys = dc.keys()
6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	593 keys.sort()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	594 for file_ in keys:
791 040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	595 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	596 % (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	597 time.strftime("%x %X",
040655ea0cc4 Show all dirstate info for 'hg debugstate'. Thomas Arendsen Hein <thomas@intevation.de> parents: 770 diff changeset	598 time.localtime(dc[file_][3])), file_))
460 6409d9a0df43 add dirstate debugging commands mpm@selenic.com parents: 452 diff changeset	599
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	600 def debugindex(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	601 """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	602 r = hg.revlog(hg.opener(""), file_, "")
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	603 ui.write(" rev offset length base linkrev" +
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	604 " p1 p2 nodeid\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	605 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	606 e = r.index[i]
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	607 ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % (
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	608 i, e[0], e[1], e[2], e[3],
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	609 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	610
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	611 def debugindexdot(ui, file_):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	612 """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	613 r = hg.revlog(hg.opener(""), file_, "")
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	614 ui.write("digraph G {\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	615 for i in range(r.count()):
b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	616 e = r.index[i]
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	617 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	618 if e[5] != hg.nullid:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	619 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i))
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	620 ui.write("}\n")
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	621
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	622 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	623 items = list(walk(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	624 fmt = '%%s %%-%ds %%s' % max([len(abs) for (src, abs, rel) in items])
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	625 for i in items: print fmt % i
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	626
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	627 def diff(ui, repo, pats, *opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	628 """diff working directory (or selected files)"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	629 revs = []
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	630 if opts['rev']:
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	631 revs = map(lambda x: repo.lookup(x), 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	632
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	633 if len(revs) > 2:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	634 raise Abort("too many revisions to diff")
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	635
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	636 files = []
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	637 roots, match, results = makewalk(repo, pats, opts)
a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	638 for src, abs, rel in results:
732 ba0b6d17a6de Convert diff command over to using walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 731 diff changeset	639 files.append(abs)
837 a95c9b3fc3bf Fix performance of hg diff. Bryan O'Sullivan <bos@serpentine.com> parents: 823 diff changeset	640 dodiff(sys.stdout, ui, repo, files, revs, *{'match': match})
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	641
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	642 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	643 node = repo.lookup(changeset)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	644 prev, other = repo.changelog.parents(node)
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	645 change = repo.changelog.read(node)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	646
729 626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	647 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	648 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	649 revwidth=revwidth)
626aa658e2a9 Turn make_filename into make_file, which returns a file handle. Bryan O'Sullivan <bos@serpentine.com> parents: 727 diff changeset	650 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	651 ui.note("%s\n" % fp.name)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	652
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	653 fp.write("# HG changeset patch\n")
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	654 fp.write("# User %s\n" % change[1])
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	655 fp.write("# Node ID %s\n" % hg.hex(node))
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	656 fp.write("# Parent %s\n" % hg.hex(prev))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	657 if other != hg.nullid:
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	658 fp.write("# Parent %s\n" % hg.hex(other))
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	659 fp.write(change[4].rstrip())
df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 580 diff changeset	660 fp.write("\n\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	661
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	662 dodiff(fp, ui, repo, None, prev, node)
739 36edb39e8e8c Split make_file back out into make_filename and make_file. Bryan O'Sullivan <bos@serpentine.com> parents: 738 diff changeset	663 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	664
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	665 def export(ui, repo, changesets, *opts):
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	666 """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	667 if not changesets:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	668 raise Abort("export requires at least one changeset")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	669 seqno = 0
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	670 revs = list(revrange(ui, repo, changesets))
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	671 total = len(revs)
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	672 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	673 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	674 for cset in revs:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	675 seqno += 1
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	676 doexport(ui, repo, cset, seqno, total, revwidth, opts)
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	677
810 790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	678 def forget(ui, repo, pats, *opts):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	679 """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	680 q = dict(zip(pats, pats))
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	681 forget = []
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	682 for src, abs, rel in walk(repo, pats, opts):
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	683 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	684 forget.append(abs)
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	685 if rel not in q: ui.status('forgetting ', rel, '\n')
790a0ff306f2 Move commands.forget over to using new walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 809 diff changeset	686 repo.forget(forget)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	687
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	688 def heads(ui, repo):
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	689 """show current repository heads"""
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	690 for n in repo.changelog.heads():
329 67c19ad374a9 Use common output function show_changeset() for hg heads\|history\|log\|tip. Thomas Arendsen Hein <thomas@intevation.de> parents: 320 diff changeset	691 show_changeset(ui, repo, changenode=n)
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 220 diff changeset	692
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	693 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	694 """print information about the working copy"""
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	695 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	696 if not parents:
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	697 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	698 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	699
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	700 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	701 (c, a, d, u) = repo.changes()
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	702 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	703 (c or a or d) and "+" or "")]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	704
339 a76fc9c4b67b added hg identify\|id (based on a patch from Andrew Thompson) Thomas Arendsen Hein <thomas@intevation.de> parents: 338 diff changeset	705 if not ui.quiet:
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	706 # multiple tags for a single parent separated by '/'
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	707 parenttags = ['/'.join(tags)
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	708 for tags in map(repo.nodetags, parents) if tags]
494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	709 # 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	710 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	711 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	712
386 494c8e3f47f3 Improvements for hg identify: Thomas Arendsen Hein <thomas@intevation.de> parents: 371 diff changeset	713 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	714
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	715 def import_(ui, repo, patch1, patches, *opts):
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	716 """import an ordered set of patches"""
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	717 patches = (patch1,) + patches
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	718
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	719 d = opts["base"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	720 strip = opts["strip"]
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	721
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	722 for patch in patches:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	723 ui.status("applying %s\n" % patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	724 pf = os.path.join(d, patch)
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	725
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	726 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	727 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	728 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	729 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	730 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	731 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	732 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	733 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	734 # 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	735 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	736 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	737 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	738 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	739 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	740 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	741 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	742 hgpatch = True
852 1df0983eb589 Allow HG patch to appear late in the input stream Samuel Tardieu <sam@rfc1149.net> parents: 849 diff changeset	743 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	744 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	745 message.append(line)
607 94744f6fe0e7 [PATCH] Parse and use header data from an hg export'ed changeset mpm@selenic.com parents: 605 diff changeset	746
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	747 # make sure message isn't empty
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	748 if not message:
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	749 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	750 else:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	751 message = "%s\n" % '\n'.join(message)
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	752 ui.debug('message:\n%s\n' % message)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	753
826 16700cdd9055 Allow import from files with spaces Kyle Moffett <mrmacman_g4@mac.com> parents: 825 diff changeset	754 f = os.popen("patch -p%d < '%s'" % (strip, pf))
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	755 files = []
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	756 for l in f.read().splitlines():
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	757 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	758 ui.status("%s\n" % l)
674 6513ba7d858a Make consistent use of str.startswith() in conditionals. chad.netzer@gmail.com parents: 668 diff changeset	759 if l.startswith('patching file '):
443 470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	760 pf = l[14:]
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	761 if pf not in files:
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	762 files.append(pf)
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	763 patcherr = f.close()
470a83212dda hg import error checking mpm@selenic.com parents: 437 diff changeset	764 if patcherr:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	765 raise Abort("patch failed")
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	766
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	767 if len(files) > 0:
5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	768 addremove(ui, repo, *files)
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	769 repo.commit(files, message, user)
437 5b38a5af4019 Commands cleanup mpm@selenic.com parents: 429 diff changeset	770
496 6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	771 def init(ui, source=None):
6ce95a04999d [PATCH] simplify init mpm@selenic.com parents: 495 diff changeset	772 """create a new repository in the current directory"""
290 07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	773
07c6cb9fd1c5 replace hg branch with hg init [source] mpm@selenic.com parents: 289 diff changeset	774 if source:
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	775 raise Abort("no longer supported: use \"hg clone\" instead")
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	776 hg.repository(ui, ".", create=1)
338 1e091b3293d5 default path support with .hg/hgrc mpm@selenic.com parents: 335 diff changeset	777
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	778 def locate(ui, repo, pats, *opts):
b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	779 """locate files matching specific patterns"""
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	780 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	781 if opts['print0']: end = '\0'
742 092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	782
092937de2ad7 Refactor matchpats and walk mpm@selenic.com parents: 740 diff changeset	783 for src, abs, rel 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	784 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	785 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	786 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	787 else:
1c0c413cccdd Get add and locate to use new repo and dirstate walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 723 diff changeset	788 ui.write(rel, end)
627 b6c42714d900 Add locate command. Bryan O'Sullivan <bos@serpentine.com> parents: 625 diff changeset	789
552 2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	790 def log(ui, repo, f=None, **opts):
509 98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	791 """show the revision history of the repository or a single file"""
98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	792 if f:
612 9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	793 files = relpath(repo, [f])
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	794 filelog = repo.file(files[0])
552 2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	795 log = filelog
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	796 lookup = filelog.lookup
509 98a2935c3d6c [PATCH] replace history with log mpm@selenic.com parents: 508 diff changeset	797 else:
612 9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	798 files = None
552 2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	799 filelog = None
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	800 log = repo.changelog
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	801 lookup = repo.lookup
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	802 revlist = []
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	803 revs = [log.rev(lookup(rev)) for rev in opts['rev']]
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	804 while revs:
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	805 if len(revs) == 1:
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	806 revlist.append(revs.pop(0))
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	807 else:
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	808 a = revs.pop(0)
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	809 b = revs.pop(0)
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	810 off = a > b and -1 or 1
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	811 revlist.extend(range(a, b + off, off))
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	812
552 2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	813 for i in revlist or range(log.count() - 1, -1, -1):
2204311609a0 Allow specifying revisions in 'hg log' like with 'hg diff'. Thomas Arendsen Hein <thomas@intevation.de> parents: 547 diff changeset	814 show_changeset(ui, repo, filelog=filelog, rev=i)
612 9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	815 if opts['patch']:
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	816 if filelog:
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	817 filenode = filelog.node(i)
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	818 i = filelog.linkrev(filenode)
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	819 changenode = repo.changelog.node(i)
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	820 prev, other = repo.changelog.parents(changenode)
9cd745437269 On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: Alecs King <alecsk@gmail.com> parents: 610 diff changeset	821 dodiff(sys.stdout, ui, repo, files, prev, changenode)
696 b266e92bcd0b Removed extra newline in hg log when not using the --patch option, fixed tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 689 diff changeset	822 ui.write("\n\n")
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	823
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	824 def manifest(ui, repo, rev=None):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	825 """output the latest or given revision of the project manifest"""
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	826 if rev:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	827 try:
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	828 # assume all revision numbers are for changesets
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	829 n = repo.lookup(rev)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	830 change = repo.changelog.read(n)
4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	831 n = change[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	832 except hg.RepoError:
689 4315db147f00 Make manifest lookup use changeset ids mpm@selenic.com parents: 687 diff changeset	833 n = repo.manifest.lookup(rev)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	834 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	835 n = repo.manifest.tip()
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	836 m = repo.manifest.read(n)
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	837 mf = repo.manifest.readflags(n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	838 files = m.keys()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	839 files.sort()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	840
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	841 for f in files:
276 10e325db7347 add tracking of execute permissions mpm@selenic.com parents: 275 diff changeset	842 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	843
706 5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	844 def parents(ui, repo, rev=None):
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	845 """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	846 if rev:
5107a7b6b14a Make "hg parents REV" work (again?) Thomas Arendsen Hein <thomas@intevation.de> parents: 705 diff changeset	847 p = repo.changelog.parents(repo.lookup(rev))
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	848 else:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	849 p = repo.dirstate.parents()
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	850
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	851 for n in p:
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	852 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	853 show_changeset(ui, repo, changenode=n)
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	854
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	855 def paths(ui, repo, search = None):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	856 """show path or list of available paths"""
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	857 if search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	858 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	859 if name == search:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	860 ui.write("%s\n" % path)
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	861 return
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	862 ui.warn("not found!\n")
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	863 return 1
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	864 else:
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	865 for name, path in ui.configitems("paths"):
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	866 ui.write("%s = %s\n" % (name, path))
b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	867
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	868 def pull(ui, repo, source="default", **opts):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	869 """pull changes from the specified source"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	870 source = ui.expandpath(source)
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	871 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	872
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	873 other = hg.repository(ui, source)
625 978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	874 r = repo.pull(other)
978011cf5279 Cleanups for repo.pull Matt Mackall <mpm@selenic.com> parents: 624 diff changeset	875 if not r:
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	876 if opts['update']:
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	877 return update(ui, repo)
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	878 else:
404 a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	879 ui.status("(run 'hg update' to get a working copy)\n")
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	880
a1ecef497721 [PATCH] Unintuive use mpm@selenic.com parents: 403 diff changeset	881 return r
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	882
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	883 def push(ui, repo, dest="default-push", force=False):
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	884 """push changes to the specified destination"""
506 1f81ebff98c9 [PATCH] Add ui.expandpath command mpm@selenic.com parents: 505 diff changeset	885 dest = ui.expandpath(dest)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	886 ui.status('pushing to %s\n' % (dest))
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	887
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	888 other = hg.repository(ui, dest)
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	889 r = repo.push(other, force)
640 b48b91d3fb4a Switch push over to the new scheme Matt Mackall <mpm@selenic.com> parents: 639 diff changeset	890 return r
319 9ab17e83bce3 stopgap hg push support mpm@selenic.com parents: 317 diff changeset	891
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	892 def rawcommit(ui, repo, flist, *rc):
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	893 "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	894 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	895 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	896 " 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	897 message = rc['message'] or rc['text']
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	898 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	899 try:
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	900 message = open(rc['logfile']).read()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	901 except IOError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	902 pass
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	903 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	904 ui.warn("abort: missing commit message\n")
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	905 return 1
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	906
403 fda7bb480020 [PATCH] rawcommit fix again mpm@selenic.com parents: 401 diff changeset	907 files = relpath(repo, list(flist))
246 96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	908 if rc['files']:
96cde50a746f Migrate rawcommit, import, export, history, and merge mpm@selenic.com parents: 245 diff changeset	909 files += open(rc['files']).read().splitlines()
452 a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	910
a1e91c24dab5 rawcommit: do lookup of parents at the appropriate layer mpm@selenic.com parents: 443 diff changeset	911 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	912
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	913 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	914
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	915 def recover(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	916 """roll back an interrupted transaction"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	917 repo.recover()
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	918
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	919 def remove(ui, repo, file1, *files):
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	920 """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	921 repo.remove(relpath(repo, (file1,) + files))
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	922
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	923 def revert(ui, repo, names, *opts):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	924 """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	925 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	926 repo.dirstate.parents()[0]
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	927 root = os.path.realpath(repo.root)
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	928
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	929 def trimpath(p):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	930 p = os.path.realpath(p)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	931 if p.startswith(root):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	932 rest = p[len(root):]
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	933 if not rest:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	934 return rest
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	935 if p.startswith(os.sep):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	936 return rest[1:]
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	937 return p
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	938
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	939 relnames = map(trimpath, names or [os.getcwd()])
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	940 chosen = {}
590 38d106db75bc hg revert should revert to parent, not to tip mpm@selenic.com parents: 588 diff changeset	941
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	942 def choose(name):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	943 def body(name):
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	944 for r in relnames:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	945 if not name.startswith(r):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	946 continue
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	947 rest = name[len(r):]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	948 if not rest:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	949 return r, True
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	950 depth = rest.count(os.sep)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	951 if not r:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	952 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	953 return r, True
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	954 elif rest[0] == os.sep:
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	955 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	956 return r, True
588 0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	957 return None, False
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	958 relname, ret = body(name)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	959 if ret:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	960 chosen[relname] = 1
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	961 return ret
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	962
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	963 r = repo.update(node, False, True, choose, False)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	964 for n in relnames:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	965 if n not in chosen:
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	966 ui.warn('error: no matches for %s\n' % n)
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	967 r = 1
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	968 sys.stdout.flush()
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	969 return r
0c3bae18403b [PATCH] hg revert mpm@selenic.com parents: 582 diff changeset	970
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	971 def root(ui, repo):
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	972 """print the root (top) of the current working dir"""
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	973 ui.write(repo.root + "\n")
157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	974
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	975 def serve(ui, repo, **opts):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	976 """export the repository via HTTP"""
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	977
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	978 if opts["stdio"]:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	979 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	980 sys.stdout = sys.stderr
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	981
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	982 def getarg():
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	983 argline = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	984 arg, l = argline.split()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	985 val = fin.read(int(l))
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	986 return arg, val
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	987 def respond(v):
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	988 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	989 fout.write(v)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	990 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	991
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	992 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	993
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	994 while 1:
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	995 cmd = fin.readline()[:-1]
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	996 if cmd == '':
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	997 return
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	998 if cmd == "heads":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	999 h = repo.heads()
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1000 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	1001 if cmd == "lock":
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1002 lock = repo.lock()
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1003 respond("")
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1004 if cmd == "unlock":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1005 if lock:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1006 lock.release()
638 35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1007 lock = None
35f7adfefa69 Add a scheme for handling remote locking Matt Mackall <mpm@selenic.com> parents: 635 diff changeset	1008 respond("")
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1009 elif cmd == "branches":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1010 arg, nodes = getarg()
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1011 nodes = map(hg.bin, nodes.split(" "))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1012 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1013 for b in repo.branches(nodes):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1014 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	1015 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1016 elif cmd == "between":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1017 arg, pairs = getarg()
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1018 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	1019 r = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1020 for b in repo.between(pairs):
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1021 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	1022 respond("".join(r))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1023 elif cmd == "changegroup":
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1024 nodes = []
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1025 arg, roots = getarg()
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1026 nodes = map(hg.bin, roots.split(" "))
876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1027
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1028 cg = repo.changegroup(nodes)
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1029 while 1:
85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1030 d = cg.read(4096)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1031 if not d:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1032 break
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	1033 fout.write(d)
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1034
667 31a9aa890016 A number of minor fixes to problems that pychecker found. mark.williamson@cl.cam.ac.uk parents: 654 diff changeset	1035 fout.flush()
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1036
639 31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1037 elif cmd == "addchangegroup":
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1038 if not lock:
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1039 respond("not locked")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1040 continue
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1041 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1042
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1043 r = repo.addchangegroup(fin)
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1044 respond("")
31cebba881a0 Add addchangegroup to the ssh protocol Matt Mackall <mpm@selenic.com> parents: 638 diff changeset	1045
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1046 def openlog(opt, default):
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1047 if opts[opt] and opts[opt] != '-':
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1048 return open(opts[opt], 'w')
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1049 else:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1050 return default
624 876333a295ff Add an sshrepository class and hg serve --stdio Matt Mackall <mpm@selenic.com> parents: 618 diff changeset	1051
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1052 httpd = hgweb.create_server(repo.root, opts["name"], opts["templates"],
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 824 diff changeset	1053 opts["address"], opts["port"], opts["ipv6"],
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1054 openlog('accesslog', sys.stdout),
8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1055 openlog('errorlog', sys.stderr))
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1056 if ui.verbose:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1057 addr, port = httpd.socket.getsockname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1058 if addr == '0.0.0.0':
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1059 addr = socket.gethostname()
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1060 else:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1061 try:
bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1062 addr = socket.gethostbyaddr(addr)[0]
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1063 except socket.error:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1064 pass
603 bc5d058e65e9 [PATCH] Get "hg serve" to print the URL being served mpm@selenic.com parents: 596 diff changeset	1065 if port != 80:
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1066 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	1067 else:
605 8e82fd763be2 [PATCH] Get "hg serve" to optionally log accesses and errors to files mpm@selenic.com parents: 604 diff changeset	1068 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	1069 httpd.serve_forever()
500 ebc4714a7632 [PATCH] Clean up destination directory if a clone fails. mpm@selenic.com parents: 499 diff changeset	1070
731 91ca3afab8e8 Add name matching to status command. Bryan O'Sullivan <bos@serpentine.com> parents: 729 diff changeset	1071 def status(ui, repo, pats, *opts):
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1072 '''show changed files in the working directory
d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1073
746 9095e3456ea7 Change C to M in status mpm@selenic.com parents: 745 diff changeset	1074 M = modified
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1075 A = added
fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1076 R = removed
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1077 ? = not tracked
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1078 '''
312 09375250eb31 Optimize diff and status in subdirectories mpm@selenic.com parents: 310 diff changeset	1079
820 89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1080 cwd = repo.getcwd()
89985a1b3427 Clean up walk and changes code to use normalised names properly. Bryan O'Sullivan <bos@serpentine.com> parents: 815 diff changeset	1081 files, matchfn = matchpats(cwd, pats, opts)
823 f0446f6963d2 Use list comprehension in hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 820 diff changeset	1082 (c, a, d, u) = [[pathto(cwd, x) for x in n]
f0446f6963d2 Use list comprehension in hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 820 diff changeset	1083 for n in repo.changes(files=files, match=matchfn)]
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1084
842 8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1085 changetypes = [('modified', 'M', c),
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1086 ('added', 'A', a),
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1087 ('removed', 'R', d),
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1088 ('unknown', '?', u)]
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1089
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1090 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	1091 or changetypes):
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1092 for f in changes:
8fb488773063 Rewritten change type selection for hg status. Thomas Arendsen Hein <thomas@intevation.de> parents: 841 diff changeset	1093 ui.write("%s %s\n" % (char, f))
213 d2172916ef6c commands: migrate status and branch mpm@selenic.com parents: 212 diff changeset	1094
700 d01b93efecd6 Removed extra spaces for default parameters according to PEP8. Thomas Arendsen Hein <thomas@intevation.de> parents: 699 diff changeset	1095 def tag(ui, repo, name, rev=None, **opts):
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1096 """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	1097 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	1098 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	1099 " please use -m or --message instead.\n")
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1100 if name == "tip":
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1101 ui.warn("abort: 'tip' is a reserved name!\n")
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1102 return -1
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1103 if rev:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1104 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	1105 else:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1106 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	1107
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1108 if name.find(revrangesep) >= 0:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1109 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	1110 return -1
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1111
609 2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1112 if opts['local']:
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1113 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	1114 return
2acf1f5df2e6 [PATCH] hg tag: local tag support in file .hg/localtags Matt Mackall <mpm@selenic.com> parents: 607 diff changeset	1115
723 9e0f3ba4a9c2 Work on walk code. Bryan O'Sullivan <bos@serpentine.com> parents: 705 diff changeset	1116 (c, a, d, u) = repo.changes()
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1117 for x in (c, a, d, u):
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1118 if ".hgtags" in x:
353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1119 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	1120 ui.status("(please commit .hgtags manually)\n")
580 353a2ce50423 [PATCH] New export patch mpm@selenic.com parents: 577 diff changeset	1121 return -1
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1122
617 285965ddca41 open .hgtags as binary thananck@yahoo.com parents: 615 diff changeset	1123 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	1124 if repo.dirstate.state(".hgtags") == '?':
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1125 repo.add([".hgtags"])
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1126
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1127 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	1128 "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	1129 repo.commit([".hgtags"], message, opts['user'], opts['date'])
401 af4848f83e68 From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> mpm@selenic.com parents: 396 diff changeset	1130
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1131 def tags(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1132 """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	1133
343 d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	1134 l = repo.tagslist()
d7df759d0e97 rework all code using tags mpm@selenic.com parents: 340 diff changeset	1135 l.reverse()
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1136 for t, n in l:
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1137 try:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1138 r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1139 except KeyError:
477 520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1140 r = " ?:?"
520540fd6b64 Handle errors in .hgtags or hgrc [tags] section more gracefully. Thomas Arendsen Hein <thomas@intevation.de> parents: 470 diff changeset	1141 ui.write("%-30s %s\n" % (t, r))
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1142
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1143 def tip(ui, repo):
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1144 """show the tip revision"""
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1145 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	1146 show_changeset(ui, repo, changenode=n)
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1147
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1148 def undo(ui, repo):
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1149 """undo the last commit or pull
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1150
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1151 Roll back the last pull or commit transaction on the
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1152 repository, restoring the project to its earlier state.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1153
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1154 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	1155 undo and there is no redo.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1156
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1157 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	1158 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	1159 ineffective.
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1160 """
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	1161 repo.undo()
d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	1162
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	1163 def update(ui, repo, node=None, merge=False, clean=False):
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1164 '''update or merge working directory
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1165
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1166 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	1167 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	1168 requested version, the result is the requested version.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1169
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1170 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	1171 current working directory and the requested version. Files that
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1172 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	1173 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	1174 are allowed.
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1175 '''
c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1176 node = node and repo.lookup(node) or repo.changelog.tip()
275 61d45b0ba8fb various merge improvements mpm@selenic.com parents: 270 diff changeset	1177 return repo.update(node, allow=merge, force=clean)
254 c03f58e5fd2d unify checkout and resolve into update mpm@selenic.com parents: 252 diff changeset	1178
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1179 def verify(ui, repo):
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1180 """verify the integrity of the repository"""
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1181 return repo.verify()
863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1182
255 20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1183 # Command options and aliases are listed here, alphabetically
20a44c82795f hg help: use docstrings only mpm@selenic.com parents: 254 diff changeset	1184
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1185 table = {
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1186 "^add":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1187 (add,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1188 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1189 ('X', 'exclude', [], 'exclude path from search')],
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1190 "hg add [FILE]..."),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1191 "addremove":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1192 (addremove,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1193 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1194 ('X', 'exclude', [], 'exclude path from search')],
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1195 "hg addremove [OPTION]... [FILE]..."),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1196 "^annotate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1197 (annotate,
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1198 [('r', 'rev', '', 'revision'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1199 ('u', 'user', None, 'show user'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1200 ('n', 'number', None, 'show revision number'),
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1201 ('c', 'changeset', None, 'show changeset'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1202 ('I', 'include', [], 'include path in search'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1203 ('X', 'exclude', [], 'exclude path from search')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1204 'hg annotate [-r REV] [-u] [-n] [-c] FILE...'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1205 "cat":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1206 (cat,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1207 [('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	1208 '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	1209 "^clone":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1210 (clone,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1211 [('U', 'noupdate', None, 'skip update after cloning')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1212 'hg clone [-U] SOURCE [DEST]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1213 "^commit\|ci":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1214 (commit,
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1215 [('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	1216 ('I', 'include', [], 'include path in search'),
80fd2958235a Adapt commit to use file matching code. Bryan O'Sullivan <bos@serpentine.com> parents: 812 diff changeset	1217 ('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	1218 ('m', 'message', "", 'commit message'),
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1219 ('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	1220 ('l', 'logfile', "", 'commit message file'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1221 ('d', 'date', "", 'date code'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1222 ('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	1223 '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	1224 "copy": (copy, [], 'hg copy SOURCE DEST'),
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1225 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1226 "debugstate": (debugstate, [], 'debugstate'),
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1227 "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	1228 "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1229 "debugwalk":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1230 (debugwalk,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1231 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1232 ('X', 'exclude', [], 'exclude path from search')],
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1233 'debugwalk [OPTIONS]... [FILE]...'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1234 "^diff":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1235 (diff,
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1236 [('r', 'rev', [], 'revision'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1237 ('I', 'include', [], 'include path in search'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1238 ('X', 'exclude', [], 'exclude path from search')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1239 'hg diff [-r REV1 [-r REV2]] [FILE]...'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1240 "^export":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1241 (export,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1242 [('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	1243 "hg export [-o OUTFILE] REV..."),
841 03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1244 "forget":
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1245 (forget,
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1246 [('I', 'include', [], 'include path in search'),
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1247 ('X', 'exclude', [], 'exclude path from search')],
03cc2ba291d1 Realigned command table again. Thomas Arendsen Hein <thomas@intevation.de> parents: 840 diff changeset	1248 "hg forget FILE..."),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1249 "heads": (heads, [], 'hg heads'),
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1250 "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	1251 "identify\|id": (identify, [], 'hg identify'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1252 "import\|patch":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1253 (import_,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1254 [('p', 'strip', 1, 'path strip'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1255 ('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	1256 "hg import [-p NUM] [-b BASE] PATCH..."),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	1257 "^init": (init, [], 'hg init'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1258 "locate":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1259 (locate,
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1260 [('r', 'rev', '', 'revision'),
7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1261 ('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	1262 ('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	1263 ('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	1264 ('X', 'exclude', [], 'exclude path from search')],
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1265 'hg locate [-r REV] [-f] [-0] [PATTERN]...'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1266 "^log\|history":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1267 (log,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1268 [('r', 'rev', [], 'revision'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1269 ('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	1270 '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	1271 "manifest": (manifest, [], 'hg manifest [REV]'),
116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1272 "parents": (parents, [], 'hg parents [REV]'),
779 b3c7cb74d325 Add paths command TK Soh <teekaysoh@yahoo.com> parents: 778 diff changeset	1273 "paths": (paths, [], 'hg paths [name]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1274 "^pull":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1275 (pull,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1276 [('u', 'update', None, 'update working directory')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1277 'hg pull [-u] [SOURCE]'),
818 eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1278 "^push":
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1279 (push,
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1280 [('f', 'force', None, 'force push')],
eef752151556 Actually implement the -f switch for push mpm@selenic.com parents: 815 diff changeset	1281 'hg push [DEST]'),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1282 "rawcommit":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1283 (rawcommit,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1284 [('p', 'parent', [], 'parent'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1285 ('d', 'date', "", 'date code'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1286 ('u', 'user', "", 'user'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1287 ('F', 'files', "", 'file list'),
762 312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1288 ('m', 'message', "", 'commit message'),
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1289 ('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	1290 ('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	1291 'hg rawcommit [OPTION]... [FILE]...'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1292 "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	1293 "^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	1294 "^revert":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1295 (revert,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1296 [("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	1297 ("r", "rev", "", "revision")],
757 7000825ef3ba Updated help strings and test-help: Thomas Arendsen Hein <thomas@intevation.de> parents: 755 diff changeset	1298 "hg revert [-n] [-r REV] [NAME]..."),
468 157675add351 [PATCH] add "root" command mpm@selenic.com parents: 467 diff changeset	1299 "root": (root, [], "hg root"),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1300 "^serve":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1301 (serve,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1302 [('A', 'accesslog', '', 'access log file'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1303 ('E', 'errorlog', '', 'error log file'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1304 ('p', 'port', 8000, 'listen port'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1305 ('a', 'address', '', 'interface address'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1306 ('n', 'name', os.getcwd(), 'repository name'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1307 ('', 'stdio', None, 'for remote clients'),
825 0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 824 diff changeset	1308 ('t', 'templates', "", 'template map'),
0108c602feb9 Add an option to hg serve to serve file using IPv6 Samuel Tardieu <sam@rfc1149.net> parents: 824 diff changeset	1309 ('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	1310 "hg serve [OPTION]..."),
840 141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1311 "^status":
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1312 (status,
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1313 [('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	1314 ('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	1315 ('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	1316 ('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	1317 ('I', 'include', [], 'include path in search'),
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1318 ('X', 'exclude', [], 'exclude path from search')],
141744605b51 hg status: added options to select files by status. tksoh@users.sourceforge.net parents: 839 diff changeset	1319 "hg status [FILE]..."),
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1320 "tag":
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1321 (tag,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1322 [('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	1323 ('m', 'message', "", 'commit message'),
312b4a10d862 Changed more occurances of 'text' to 'message'. Thomas Arendsen Hein <thomas@intevation.de> parents: 761 diff changeset	1324 ('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	1325 ('d', 'date', "", 'date code'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1326 ('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	1327 'hg tag [OPTION]... NAME [REV]'),
248 b7645b3c86ff migrate remaining commands mpm@selenic.com parents: 247 diff changeset	1328 "tags": (tags, [], 'hg tags'),
245 fef0f8e041aa big heap of command clean-up work mpm@selenic.com parents: 241 diff changeset	1329 "tip": (tip, [], 'hg tip'),
210 d2badbd7d1ad hg undo: fixup working dir state mpm@selenic.com parents: 209 diff changeset	1330 "undo": (undo, [], 'hg undo'),
593 ca3c499e94c6 Shorten help mpm@selenic.com parents: 592 diff changeset	1331 "^update\|up\|checkout\|co":
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1332 (update,
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1333 [('m', 'merge', None, 'allow merging of conflicts'),
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1334 ('C', 'clean', None, 'overwrite locally modified files')],
707 116b2d3f4554 Changed command synopsises to match style of common UNIX tools. Thomas Arendsen Hein <thomas@intevation.de> parents: 706 diff changeset	1335 'hg update [-m] [-C] [REV]'),
247 863b508c5b36 migrate verify mpm@selenic.com parents: 246 diff changeset	1336 "verify": (verify, [], 'hg verify'),
470 0ab093b473c5 Fix up version module name and command conflict mpm@selenic.com parents: 468 diff changeset	1337 "version": (show_version, [], 'hg version'),
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1338 }
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1339
845 52576cf969f2 More verbose information on the global options kreijack@inwind.REMOVEME.it parents: 844 diff changeset	1340 globalopts = [('v', 'verbose', None, 'verbose mode'),
52576cf969f2 More verbose information on the global options kreijack@inwind.REMOVEME.it parents: 844 diff changeset	1341 ('', 'debug', None, 'debug mode'),
52576cf969f2 More verbose information on the global options kreijack@inwind.REMOVEME.it parents: 844 diff changeset	1342 ('q', 'quiet', None, 'quiet mode'),
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1343 ('', 'profile', None, 'profile'),
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1344 ('R', 'repository', "", 'repository root directory'),
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1345 ('', 'traceback', None, 'print traceback on exception'),
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1346 ('y', 'noninteractive', None, 'run non-interactively'),
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1347 ('', '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	1348 ('', '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	1349 ]
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1350
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 484 diff changeset	1351 norepo = "clone init version help debugindex debugindexdot"
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1352
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1353 def find(cmd):
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1354 for e in table.keys():
335 74b9332faece Fix misrecognition of commands mpm@selenic.com parents: 333 diff changeset	1355 if re.match("(%s)$" % e, cmd):
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	1356 return e, table[e]
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1357
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1358 raise UnknownCommand(cmd)
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1359
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1360 class SignalInterrupt(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1361 """Exception raised on SIGTERM and SIGHUP."""
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1362
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1363 def catchterm(*args):
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1364 raise SignalInterrupt
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1365
249 619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1366 def run():
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1367 sys.exit(dispatch(sys.argv[1:]))
619e775aa7f9 import and startup cleanups mpm@selenic.com parents: 248 diff changeset	1368
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1369 class ParseError(Exception):
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1370 """Exception raised on errors in parsing the command line."""
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1371
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1372 def parse(args):
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1373 options = {}
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1374 cmdoptions = {}
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1375
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1376 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1377 args = fancyopts.fancyopts(args, globalopts, options)
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1378 except fancyopts.getopt.GetoptError, inst:
618 4051b78c53c7 Handle unrecognised options correctly. Bryan O'Sullivan <bos@serpentine.com> parents: 617 diff changeset	1379 raise ParseError(None, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1380
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1381 if options["version"]:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1382 return ("version", show_version, [], options, cmdoptions)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1383 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	1384 return ("help", help_, ["shortlist"], options, cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1385 else:
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1386 cmd, args = args[0], args[1:]
63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1387
849 8933ef744325 Further help improvements: Thomas Arendsen Hein <thomas@intevation.de> parents: 848 diff changeset	1388 i = find(cmd)[1]
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1389
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1390 # combine global options into local
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1391 c = list(i[1])
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1392 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1393 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	1394
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	1395 try:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1396 args = fancyopts.fancyopts(args, c, cmdoptions)
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	1397 except fancyopts.getopt.GetoptError, inst:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1398 raise ParseError(cmd, inst)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1399
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1400 # separate global options back out
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1401 for o in globalopts:
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1402 n = o[1]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1403 options[n] = cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1404 del cmdoptions[n]
74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1405
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1406 return (cmd, i[0], args, options, cmdoptions)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1407
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1408 def dispatch(args):
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1409 signal.signal(signal.SIGTERM, catchterm)
697 cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1410 try:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1411 signal.signal(signal.SIGHUP, catchterm)
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1412 except AttributeError:
cb1be2327220 Multiple cleanups of things detected by pylint. Thomas Arendsen Hein <thomas@intevation.de> parents: 696 diff changeset	1413 pass
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1414
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1415 try:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1416 cmd, func, args, options, cmdoptions = parse(args)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1417 except ParseError, inst:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1418 u = ui.ui()
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1419 if inst.args[0]:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1420 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	1421 help_(u, inst.args[0])
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1422 else:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1423 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	1424 help_(u, 'shortlist')
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1425 sys.exit(-1)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1426 except UnknownCommand, inst:
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1427 u = ui.ui()
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1428 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	1429 help_(u, 'shortlist')
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1430 sys.exit(1)
9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1431
783 4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1432 if options["time"]:
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1433 def get_times():
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1434 t = os.times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1435 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	1436 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	1437 return t
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1438 s = get_times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1439 def print_time():
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1440 t = get_times()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1441 u = ui.ui()
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1442 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	1443 (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	1444 atexit.register(print_time)
4b06fc1c0f26 Add a --time command line option to time hg commands Stephen Darnell parents: 779 diff changeset	1445
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1446 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	1447 not options["noninteractive"])
592 74175ce83378 Restructure option handling mpm@selenic.com parents: 591 diff changeset	1448
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	1449 try:
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1450 try:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1451 if cmd not in norepo.split():
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1452 path = options["repository"] or ""
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1453 repo = hg.repository(ui=u, path=path)
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1454 d = lambda: func(u, repo, args, *cmdoptions)
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1455 else:
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1456 d = lambda: func(u, args, *cmdoptions)
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1457
527 58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1458 if options['profile']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1459 import hotshot, hotshot.stats
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1460 prof = hotshot.Profile("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1461 r = prof.runcall(d)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1462 prof.close()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1463 stats = hotshot.stats.load("hg.prof")
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1464 stats.strip_dirs()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1465 stats.sort_stats('time', 'calls')
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1466 stats.print_stats(40)
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1467 return r
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1468 else:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1469 return d()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1470 except:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1471 if options['traceback']:
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1472 traceback.print_exc()
58790c83ce52 [PATCH] Add --traceback option mpm@selenic.com parents: 526 diff changeset	1473 raise
508 42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 506 diff changeset	1474 except util.CommandError, inst:
42a660abaf75 [PATCH] Harden os.system mpm@selenic.com parents: 506 diff changeset	1475 u.warn("abort: %s\n" % inst.args)
499 81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	1476 except hg.RepoError, inst:
81c563a254be Add exception class for repository errors mpm@selenic.com parents: 496 diff changeset	1477 u.warn("abort: ", inst, "!\n")
214 2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1478 except SignalInterrupt:
2d60aa9bde0a catch TERM signal in command processor mpm@selenic.com parents: 213 diff changeset	1479 u.warn("killed!\n")
209 63af1db35611 Beginning of new command parsing interface mpm@selenic.com parents: diff changeset	1480 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	1481 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	1482 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	1483 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	1484 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	1485 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	1486 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	1487 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	1488 raise
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	1489 except IOError, inst:
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	1490 if hasattr(inst, "code"):
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	1491 u.warn("abort: %s\n" % inst)
fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	1492 elif hasattr(inst, "reason"):
773 d77c1031fd17 Hide errno in abort messages mpm@selenic.com parents: 771 diff changeset	1493 u.warn("abort: error: %s\n" % inst.reason[1])
395 fbe8834923c5 commands: report http exceptions nicely mpm@selenic.com parents: 393 diff changeset	1494 elif hasattr(inst, "args") and inst[0] == errno.EPIPE:
693 10c0264751da Be quiet about broken pipes mpm@selenic.com parents: 689 diff changeset	1495 if u.debugflag: u.warn("broken pipe\n")
250 45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	1496 else:
45ee7c4cae4f Catch broken pipes in command interpreter mpm@selenic.com parents: 249 diff changeset	1497 raise
549 92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	1498 except OSError, inst:
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	1499 if hasattr(inst, "filename"):
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	1500 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename))
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	1501 else:
92b60cabf808 [PATCH] Catch OSError usefully mpm@selenic.com parents: 547 diff changeset	1502 u.warn("abort: %s\n" % inst.strerror)
727 acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	1503 except Abort, inst:
acee766fcb79 Get commands to raise Abort instead of ui.warn(...),sys.exit(1). Bryan O'Sullivan <bos@serpentine.com> parents: 726 diff changeset	1504 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	1505 sys.exit(1)
212 48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1506 except TypeError, inst:
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1507 # was this an argument error?
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1508 tb = traceback.extract_tb(sys.exc_info()[2])
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1509 if len(tb) > 2: # no
48398a5353e3 commands: better argument processing, per-command help mpm@selenic.com parents: 211 diff changeset	1510 raise
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	1511 u.debug(inst, "\n")
596 9a8daeff0ffa A bunch of parsing/help updates mpm@selenic.com parents: 593 diff changeset	1512 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	1513 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	1514 except UnknownCommand, inst:
221628fe9b62 Always show short help when an unknown command is given. Thomas Arendsen Hein <thomas@intevation.de> parents: 846 diff changeset	1515 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	1516 help_(u, 'shortlist')
293 11d64332a1cb hg help improvements mpm@selenic.com parents: 290 diff changeset	1517
503 c6a2e41c8c60 Fix troubles with clone and exception handling mpm@selenic.com parents: 500 diff changeset	1518 sys.exit(-1)

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/commands.py @ 859:6390c377a9e6