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