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