annotate mercurial/commands.py @ 738:32a97c9d8e98

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