Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/commands.py @ 595:c2c2c6d617bd
Expand undo docs
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Expand undo docs
manifest hash: 4381a35ef96ce10176dde3c9c6c2503f65ae8a09
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyD93ywK+sNU5EO8RAianAJ97+hYOTwV3OvAAekcYn3f1Ahzf4ACeLjgz
kUAHrjSmhs2F421lXxbgCfw=
=gbg9
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 03 Jul 2005 11:41:43 -0800 |
parents | ca3c499e94c6 |
children | 9a8daeff0ffa |
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 | |
262 | 8 import os, re, sys, signal |
419
28511fc21073
[PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents:
417
diff
changeset
|
9 import fancyopts, ui, hg, util |
262 | 10 from demandload import * |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
11 demandload(globals(), "mdiff time hgweb traceback random signal errno version") |
209 | 12 |
13 class UnknownCommand(Exception): pass | |
14 | |
245 | 15 def filterfiles(filters, files): |
16 l = [ x for x in files if x in filters ] | |
213 | 17 |
245 | 18 for t in filters: |
419
28511fc21073
[PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents:
417
diff
changeset
|
19 if t and t[-1] != "/": t += "/" |
245 | 20 l += [ x for x in files if x.startswith(t) ] |
213 | 21 return l |
22 | |
245 | 23 def relfilter(repo, files): |
213 | 24 if os.getcwd() != repo.root: |
25 p = os.getcwd()[len(repo.root) + 1: ] | |
419
28511fc21073
[PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents:
417
diff
changeset
|
26 return filterfiles([util.pconvert(p)], files) |
245 | 27 return files |
213 | 28 |
209 | 29 def relpath(repo, args): |
30 if os.getcwd() != repo.root: | |
31 p = os.getcwd()[len(repo.root) + 1: ] | |
554 | 32 return [ util.pconvert(os.path.normpath(os.path.join(p, x))) |
33 for x in args ] | |
209 | 34 return args |
245 | 35 |
580 | 36 revrangesep = ':' |
37 | |
38 def revrange(ui, repo, revs = [], revlog = None): | |
39 if revlog is None: | |
40 revlog = repo.changelog | |
41 revcount = revlog.count() | |
42 def fix(val, defval): | |
43 if not val: return defval | |
44 try: | |
45 num = int(val) | |
46 if str(num) != val: raise ValueError | |
47 if num < 0: num += revcount | |
48 if not (0 <= num < revcount): | |
49 raise ValueError | |
50 except ValueError: | |
51 try: | |
52 num = repo.changelog.rev(repo.lookup(val)) | |
53 except KeyError: | |
54 try: | |
55 num = revlog.rev(revlog.lookup(val)) | |
56 except KeyError: | |
57 ui.warn('abort: invalid revision identifier %s\n' % val) | |
58 sys.exit(1) | |
59 return num | |
60 for spec in revs: | |
61 if spec.find(revrangesep) >= 0: | |
62 start, end = spec.split(revrangesep, 1) | |
63 start = fix(start, 0) | |
64 end = fix(end, revcount - 1) | |
65 if end > start: | |
66 end += 1 | |
67 step = 1 | |
68 else: | |
69 end -= 1 | |
70 step = -1 | |
71 for rev in xrange(start, end, step): | |
72 yield str(rev) | |
73 else: | |
74 yield spec | |
75 | |
76 def dodiff(fp, ui, repo, files = None, node1 = None, node2 = None): | |
245 | 77 def date(c): |
78 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | |
79 | |
561 | 80 (c, a, d, u) = repo.changes(node1, node2, files) |
537 | 81 if files: |
82 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
83 | |
84 if not c and not a and not d: | |
85 return | |
86 | |
245 | 87 if node2: |
88 change = repo.changelog.read(node2) | |
89 mmap2 = repo.manifest.read(change[0]) | |
90 def read(f): return repo.file(f).read(mmap2[f]) | |
91 date2 = date(change) | |
92 else: | |
93 date2 = time.asctime() | |
94 if not node1: | |
95 node1 = repo.dirstate.parents()[0] | |
417 | 96 def read(f): return repo.wfile(f).read() |
245 | 97 |
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
|
98 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
|
99 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
|
100 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
|
101 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
|
102 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
|
103 |
245 | 104 change = repo.changelog.read(node1) |
105 mmap = repo.manifest.read(change[0]) | |
106 date1 = date(change) | |
107 | |
108 for f in c: | |
275 | 109 to = None |
110 if f in mmap: | |
111 to = repo.file(f).read(mmap[f]) | |
245 | 112 tn = read(f) |
580 | 113 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
245 | 114 for f in a: |
264
4c1d7072d5cd
Attempt to make diff deal with null sources properly
mpm@selenic.com
parents:
262
diff
changeset
|
115 to = None |
245 | 116 tn = read(f) |
580 | 117 fp.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
245 | 118 for f in d: |
119 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
|
120 tn = None |
580 | 121 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
|
122 |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
123 def show_changeset(ui, repo, rev=0, changenode=None, filelog=None): |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
124 """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
|
125 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
|
126 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
|
127 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
|
128 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
|
129 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
|
130 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
|
131 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
|
132 else: |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
133 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
|
134 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
|
135 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
|
136 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
|
137 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
|
138 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
|
139 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
|
140 |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
141 if ui.quiet: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
142 ui.write("%d:%s\n" % (rev, hg.hex(node))) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
143 return |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
144 |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
145 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
|
146 |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
147 parents = [(log.rev(parent), hg.hex(parent)) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
148 for parent in log.parents(node) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
149 if ui.debugflag or parent != hg.nullid] |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
150 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
|
151 parents = [] |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
152 |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
153 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
|
154 ui.write("revision: %d:%s\n" % (filerev, hg.hex(filenode))) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
155 for parent in parents: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
156 ui.write("parent: %d:%s\n" % parent) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
157 ui.status("changeset: %d:%s\n" % (changerev, hg.hex(changenode))) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
158 else: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
159 ui.write("changeset: %d:%s\n" % (changerev, hg.hex(changenode))) |
387
c07c6fb2f0a8
Show tags in hg history etc.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
386
diff
changeset
|
160 for tag in repo.nodetags(changenode): |
c07c6fb2f0a8
Show tags in hg history etc.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
386
diff
changeset
|
161 ui.status("tag: %s\n" % tag) |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
162 for parent in parents: |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
163 ui.write("parent: %d:%s\n" % parent) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
164 ui.note("manifest: %d:%s\n" % (repo.manifest.rev(changes[0]), |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
165 hg.hex(changes[0]))) |
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
166 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
|
167 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
|
168 time.localtime(float(changes[2].split(' ')[0])))) |
493
30752b14f759
Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
169 if ui.debugflag: |
536 | 170 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
|
171 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
|
172 if value: |
df9b77f67998
Make show_changeset show added and deleted files in verbose mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
173 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
|
174 else: |
30752b14f759
Make show_changeset show added/deleted files only in debug mode.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
490
diff
changeset
|
175 ui.note("files: %s\n" % " ".join(changes[3])) |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
176 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
|
177 if description: |
330 | 178 if ui.verbose: |
179 ui.status("description:\n") | |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
180 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
|
181 ui.status("\n\n") |
330 | 182 else: |
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
183 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
|
184 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
|
185 |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
186 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
|
187 """output version and copyright information""" |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
188 ui.write("Mercurial version %s\n" % version.get_version()) |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
189 ui.status( |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
190 "\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
|
191 "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
|
192 "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
|
193 "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
|
194 ) |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
195 |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
196 def help(ui, cmd=None): |
255 | 197 '''show help for a given command or all commands''' |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
198 if cmd: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
199 try: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
200 i = find(cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
201 ui.write("%s\n\n" % i[2]) |
293 | 202 |
203 if i[1]: | |
204 for s, l, d, c in i[1]: | |
205 opt=' ' | |
206 if s: opt = opt + '-' + s + ' ' | |
207 if l: opt = opt + '--' + l + ' ' | |
208 if d: opt = opt + '(' + str(d) + ')' | |
209 ui.write(opt, "\n") | |
210 if c: ui.write(' %s\n' % c) | |
211 ui.write("\n") | |
212 | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
213 ui.write(i[0].__doc__, "\n") |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
214 except UnknownCommand: |
268 | 215 ui.warn("hg: unknown command %s\n" % cmd) |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
216 sys.exit(0) |
255 | 217 else: |
593 | 218 if ui.verbose: |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
219 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
|
220 ui.write('\n') |
593 | 221 if ui.verbose: |
222 ui.write('hg commands:\n\n') | |
223 else: | |
224 ui.write('basic hg commands (use -v for long list):\n\n') | |
209 | 225 |
255 | 226 h = {} |
479
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
227 for c, e in table.items(): |
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
228 f = c.split("|")[0] |
593 | 229 if not ui.verbose and not f.startswith("^"): |
479
7293cb91bf2a
Cleaned up command alias handling in help.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
477
diff
changeset
|
230 continue |
593 | 231 if not ui.debugflag and f.startswith("debug"): |
232 continue | |
233 f = f.lstrip("^") | |
255 | 234 d = "" |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
235 if e[0].__doc__: |
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
236 d = e[0].__doc__.splitlines(0)[0].rstrip() |
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
237 h[f] = d |
255 | 238 |
239 fns = h.keys() | |
240 fns.sort() | |
241 m = max(map(len, fns)) | |
242 for f in fns: | |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
243 ui.write(' %-*s %s\n' % (m, f, h[f])) |
255 | 244 |
245 # Commands start here, listed alphabetically | |
209 | 246 |
245 | 247 def add(ui, repo, file, *files): |
248 '''add the specified files on the next commit''' | |
249 repo.add(relpath(repo, (file,) + files)) | |
213 | 250 |
353 | 251 def addremove(ui, repo, *files): |
255 | 252 """add all new files, delete all missing files""" |
353 | 253 if files: |
254 files = relpath(repo, files) | |
255 d = [] | |
256 u = [] | |
257 for f in files: | |
258 p = repo.wjoin(f) | |
259 s = repo.dirstate.state(f) | |
260 isfile = os.path.isfile(p) | |
261 if s != 'r' and not isfile: | |
262 d.append(f) | |
263 elif s not in 'nmai' and isfile: | |
264 u.append(f) | |
265 else: | |
536 | 266 (c, a, d, u) = repo.changes(None, None) |
259 | 267 repo.add(u) |
245 | 268 repo.remove(d) |
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
269 |
245 | 270 def annotate(u, repo, file, *files, **ops): |
255 | 271 """show changeset information per file line""" |
209 | 272 def getnode(rev): |
273 return hg.short(repo.changelog.node(rev)) | |
274 | |
275 def getname(rev): | |
276 try: | |
277 return bcache[rev] | |
278 except KeyError: | |
279 cl = repo.changelog.read(repo.changelog.node(rev)) | |
280 name = cl[1] | |
281 f = name.find('@') | |
282 if f >= 0: | |
283 name = name[:f] | |
534
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
532
diff
changeset
|
284 f = name.find('<') |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
532
diff
changeset
|
285 if f >= 0: |
ab0d1bfeee7c
[PATCH] Handle 'name firstname <email@server>' correctly in annotate
mpm@selenic.com
parents:
532
diff
changeset
|
286 name = name[f+1:] |
209 | 287 bcache[rev] = name |
288 return name | |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
289 |
209 | 290 bcache = {} |
291 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | |
292 if not ops['user'] and not ops['changeset']: | |
293 ops['number'] = 1 | |
294 | |
227 | 295 node = repo.dirstate.parents()[0] |
209 | 296 if ops['revision']: |
297 node = repo.changelog.lookup(ops['revision']) | |
298 change = repo.changelog.read(node) | |
299 mmap = repo.manifest.read(change[0]) | |
245 | 300 for f in relpath(repo, (file,) + files): |
209 | 301 lines = repo.file(f).annotate(mmap[f]) |
302 pieces = [] | |
303 | |
304 for o, f in opmap: | |
305 if ops[o]: | |
306 l = [ f(n) for n,t in lines ] | |
307 m = max(map(len, l)) | |
308 pieces.append([ "%*s" % (m, x) for x in l]) | |
309 | |
310 for p,l in zip(zip(*pieces), lines): | |
311 u.write(" ".join(p) + ": " + l[1]) | |
312 | |
248 | 313 def cat(ui, repo, file, rev = []): |
255 | 314 """output the latest or given revision of a file""" |
281 | 315 r = repo.file(relpath(repo, [file])[0]) |
248 | 316 n = r.tip() |
317 if rev: n = r.lookup(rev) | |
318 sys.stdout.write(r.read(n)) | |
319 | |
485 | 320 def clone(ui, source, dest = None, **opts): |
321 """make a copy of an existing repository""" | |
506 | 322 source = ui.expandpath(source) |
485 | 323 |
324 if dest is None: | |
528 | 325 dest = os.path.basename(os.path.normpath(source)) |
532
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
326 |
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
327 if os.path.exists(dest): |
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
328 ui.warn("abort: destination '%s' already exists\n" % dest) |
2e9698a5c92c
clone: abort on pre-existing destination directory
mpm@selenic.com
parents:
528
diff
changeset
|
329 return 1 |
523
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
522
diff
changeset
|
330 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
331 class dircleanup: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
332 def __init__(self, dir): |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
333 self.dir = dir |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
334 os.mkdir(dir) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
335 def close(self): |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
336 self.dir = None |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
337 def __del__(self): |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
338 if self.dir: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
339 import shutil |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
340 shutil.rmtree(self.dir, True) |
485 | 341 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
342 d = dircleanup(dest) |
485 | 343 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
344 link = 0 |
562
be6233a2bfdd
hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents:
561
diff
changeset
|
345 abspath = source |
542 | 346 if not (source.startswith("http://") or |
347 source.startswith("hg://") or | |
348 source.startswith("old-http://")): | |
562
be6233a2bfdd
hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents:
561
diff
changeset
|
349 abspath = os.path.abspath(source) |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
350 d1 = os.stat(dest).st_dev |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
351 d2 = os.stat(source).st_dev |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
352 if d1 == d2: link = 1 |
485 | 353 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
354 if link: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
355 ui.note("copying by hardlink\n") |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
356 util.system("cp -al '%s'/.hg '%s'/.hg" % (source, dest)) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
357 try: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
358 os.remove(os.path.join(dest, ".hg", "dirstate")) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
359 except: pass |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
360 |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
361 repo = hg.repository(ui, dest) |
485 | 362 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
363 else: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
364 repo = hg.repository(ui, dest, create=1) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
365 other = hg.repository(ui, source) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
366 fetch = repo.findincoming(other) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
367 if fetch: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
368 cg = other.changegroup(fetch) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
369 repo.addchangegroup(cg) |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
500
diff
changeset
|
370 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
371 f = repo.opener("hgrc", "w") |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
372 f.write("[paths]\n") |
562
be6233a2bfdd
hg clone: only use the absolute path for .hg/hgrc
mpm@selenic.com
parents:
561
diff
changeset
|
373 f.write("default = %s\n" % abspath) |
515 | 374 |
535
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
375 if not opts['noupdate']: |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
376 update(ui, repo) |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
377 |
fba26990604a
Deal with failed clone/transaction interaction
mpm@selenic.com
parents:
534
diff
changeset
|
378 d.close() |
515 | 379 |
289 | 380 def commit(ui, repo, *files, **opts): |
245 | 381 """commit the specified files or all outstanding changes""" |
289 | 382 text = opts['text'] |
383 if not text and opts['logfile']: | |
384 try: text = open(opts['logfile']).read() | |
385 except IOError: pass | |
386 | |
354 | 387 if opts['addremove']: |
388 addremove(ui, repo, *files) | |
317 | 389 repo.commit(relpath(repo, files), text, opts['user'], opts['date']) |
245 | 390 |
363 | 391 def copy(ui, repo, source, dest): |
392 """mark a file as copied or renamed for the next commit""" | |
393 return repo.copy(*relpath(repo, (source, dest))) | |
394 | |
460 | 395 def debugcheckdirstate(ui, repo): |
396 parent1, parent2 = repo.dirstate.parents() | |
555 | 397 repo.dirstate.read() |
398 dc = repo.dirstate.map | |
460 | 399 keys = dc.keys() |
400 keys.sort() | |
401 m1n = repo.changelog.read(parent1)[0] | |
402 m2n = repo.changelog.read(parent2)[0] | |
403 m1 = repo.manifest.read(m1n) | |
404 m2 = repo.manifest.read(m2n) | |
405 errors = 0 | |
406 for f in dc: | |
407 state = repo.dirstate.state(f) | |
408 if state in "nr" and f not in m1: | |
582 | 409 ui.warn("%s in state %s, but not in manifest1\n" % (f, state)) |
460 | 410 errors += 1 |
411 if state in "a" and f in m1: | |
582 | 412 ui.warn("%s in state %s, but also in manifest1\n" % (f, state)) |
460 | 413 errors += 1 |
414 if state in "m" and f not in m1 and f not in m2: | |
582 | 415 ui.warn("%s in state %s, but not in either manifest\n" % |
416 (f, state)) | |
460 | 417 errors += 1 |
418 for f in m1: | |
419 state = repo.dirstate.state(f) | |
420 if state not in "nrm": | |
582 | 421 ui.warn("%s in manifest1, but listed as state %s" % (f, state)) |
460 | 422 errors += 1 |
423 if errors: | |
582 | 424 ui.warn(".hg/dirstate inconsistent with current parent's manifest\n") |
460 | 425 sys.exit(1) |
426 | |
427 def debugdumpdirstate(ui, repo): | |
555 | 428 repo.dirstate.read() |
429 dc = repo.dirstate.map | |
460 | 430 keys = dc.keys() |
431 keys.sort() | |
432 for file in keys: | |
582 | 433 ui.write("%c %s\n" % (dc[file][0], file)) |
460 | 434 |
248 | 435 def debugindex(ui, file): |
417 | 436 r = hg.revlog(hg.opener(""), file, "") |
582 | 437 ui.write(" rev offset length base linkrev" + |
438 " p1 p2 nodeid\n") | |
248 | 439 for i in range(r.count()): |
440 e = r.index[i] | |
582 | 441 ui.write("% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s..\n" % ( |
442 i, e[0], e[1], e[2], e[3], | |
443 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))) | |
248 | 444 |
445 def debugindexdot(ui, file): | |
417 | 446 r = hg.revlog(hg.opener(""), file, "") |
582 | 447 ui.write("digraph G {\n") |
248 | 448 for i in range(r.count()): |
449 e = r.index[i] | |
582 | 450 ui.write("\t%d -> %d\n" % (r.rev(e[4]), i)) |
248 | 451 if e[5] != hg.nullid: |
582 | 452 ui.write("\t%d -> %d\n" % (r.rev(e[5]), i)) |
453 ui.write("}\n") | |
248 | 454 |
245 | 455 def diff(ui, repo, *files, **opts): |
255 | 456 """diff working directory (or selected files)""" |
245 | 457 revs = [] |
458 if opts['rev']: | |
459 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
|
460 |
245 | 461 if len(revs) > 2: |
480
430a10669928
Fixed call to ui.warn()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
479
diff
changeset
|
462 ui.warn("too many revisions to diff\n") |
245 | 463 sys.exit(1) |
464 | |
465 if files: | |
466 files = relpath(repo, files) | |
467 else: | |
468 files = relpath(repo, [""]) | |
469 | |
580 | 470 dodiff(sys.stdout, ui, repo, files, *revs) |
245 | 471 |
580 | 472 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
|
473 node = repo.lookup(changeset) |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
474 prev, other = repo.changelog.parents(node) |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
475 change = repo.changelog.read(node) |
580 | 476 |
477 def expand(name): | |
478 expansions = { | |
479 '%': lambda: '%', | |
480 'H': lambda: hg.hex(node), | |
481 'N': lambda: str(total), | |
482 'R': lambda: str(repo.changelog.rev(node)), | |
483 'b': lambda: os.path.basename(repo.root), | |
484 'h': lambda: hg.short(node), | |
485 'n': lambda: str(seqno).zfill(len(str(total))), | |
486 'r': lambda: str(repo.changelog.rev(node)).zfill(revwidth), | |
487 } | |
488 newname = [] | |
489 namelen = len(name) | |
490 i = 0 | |
491 while i < namelen: | |
492 c = name[i] | |
493 if c == '%': | |
494 i += 1 | |
495 c = name[i] | |
496 c = expansions[c]() | |
497 newname.append(c) | |
498 i += 1 | |
499 return ''.join(newname) | |
500 | |
501 if opts['output'] and opts['output'] != '-': | |
502 try: | |
503 fp = open(expand(opts['output']), 'w') | |
504 except KeyError, inst: | |
505 ui.warn("error: invalid format spec '%%%s' in output file name\n" % | |
506 inst.args[0]) | |
507 sys.exit(1) | |
508 else: | |
509 fp = sys.stdout | |
510 | |
582 | 511 fp.write("# HG changeset patch\n") |
512 fp.write("# User %s\n" % change[1]) | |
513 fp.write("# Node ID %s\n" % hg.hex(node)) | |
514 fp.write("# Parent %s\n" % hg.hex(prev)) | |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
515 if other != hg.nullid: |
582 | 516 fp.write("# Parent %s\n" % hg.hex(other)) |
517 fp.write(change[4].rstrip()) | |
518 fp.write("\n\n") | |
580 | 519 |
520 dodiff(fp, ui, repo, None, prev, node) | |
396
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
395
diff
changeset
|
521 |
580 | 522 def export(ui, repo, *changesets, **opts): |
523 """dump the header and diffs for one or more changesets""" | |
524 seqno = 0 | |
525 revs = list(revrange(ui, repo, changesets)) | |
526 total = len(revs) | |
527 revwidth = max(len(revs[0]), len(revs[-1])) | |
528 for cset in revs: | |
529 seqno += 1 | |
530 doexport(ui, repo, cset, seqno, total, revwidth, opts) | |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
531 |
245 | 532 def forget(ui, repo, file, *files): |
533 """don't add the specified files on the next commit""" | |
534 repo.forget(relpath(repo, (file,) + files)) | |
535 | |
221 | 536 def heads(ui, repo): |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
537 """show current repository heads""" |
221 | 538 for n in repo.changelog.heads(): |
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
539 show_changeset(ui, repo, changenode=n) |
221 | 540 |
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
541 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
|
542 """print information about the working copy""" |
343 | 543 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
|
544 if not parents: |
343 | 545 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
|
546 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
|
547 |
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
548 hexfunc = ui.verbose and hg.hex or hg.short |
536 | 549 (c, a, d, u) = repo.changes(None, None) |
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
550 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
|
551 (c or a or d) and "+" or "")] |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
552 |
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
553 if not ui.quiet: |
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
554 # multiple tags for a single parent separated by '/' |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
555 parenttags = ['/'.join(tags) |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
556 for tags in map(repo.nodetags, parents) if tags] |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
557 # tags for multiple parents separated by ' + ' |
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
558 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
|
559 |
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
560 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
|
561 |
437 | 562 def import_(ui, repo, patch1, *patches, **opts): |
563 """import an ordered set of patches""" | |
564 try: | |
565 import psyco | |
566 psyco.full() | |
567 except: | |
568 pass | |
569 | |
570 patches = (patch1,) + patches | |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
571 |
437 | 572 d = opts["base"] |
573 strip = opts["strip"] | |
574 | |
575 for patch in patches: | |
576 ui.status("applying %s\n" % patch) | |
577 pf = os.path.join(d, patch) | |
578 | |
579 text = "" | |
580 for l in file(pf): | |
581 if l[:4] == "--- ": break | |
582 text += l | |
583 | |
584 # make sure text isn't empty | |
585 if not text: text = "imported patch %s\n" % patch | |
586 | |
587 f = os.popen("patch -p%d < %s" % (strip, pf)) | |
588 files = [] | |
589 for l in f.read().splitlines(): | |
590 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
|
591 ui.status("%s\n" % l) |
437 | 592 if l[:14] == 'patching file ': |
443 | 593 pf = l[14:] |
594 if pf not in files: | |
595 files.append(pf) | |
596 patcherr = f.close() | |
597 if patcherr: | |
598 sys.stderr.write("patch failed") | |
599 sys.exit(1) | |
437 | 600 |
601 if len(files) > 0: | |
602 addremove(ui, repo, *files) | |
603 repo.commit(files, text) | |
604 | |
496 | 605 def init(ui, source=None): |
606 """create a new repository in the current directory""" | |
290 | 607 |
608 if source: | |
496 | 609 ui.warn("no longer supported: use \"hg clone\" instead\n") |
610 sys.exit(1) | |
611 repo = hg.repository(ui, ".", create=1) | |
338 | 612 |
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
613 def log(ui, repo, f=None, **opts): |
509 | 614 """show the revision history of the repository or a single file""" |
615 if f: | |
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
616 filelog = repo.file(relpath(repo, [f])[0]) |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
617 log = filelog |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
618 lookup = filelog.lookup |
509 | 619 else: |
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
620 filelog = None |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
621 log = repo.changelog |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
622 lookup = repo.lookup |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
623 revlist = [] |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
624 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
|
625 while revs: |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
626 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
|
627 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
|
628 else: |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
629 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
|
630 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
|
631 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
|
632 revlist.extend(range(a, b + off, off)) |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
633 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
|
634 show_changeset(ui, repo, filelog=filelog, rev=i) |
255 | 635 |
636 def manifest(ui, repo, rev = []): | |
637 """output the latest or given revision of the project manifest""" | |
638 n = repo.manifest.tip() | |
639 if rev: | |
640 n = repo.manifest.lookup(rev) | |
641 m = repo.manifest.read(n) | |
276 | 642 mf = repo.manifest.readflags(n) |
255 | 643 files = m.keys() |
644 files.sort() | |
645 | |
646 for f in files: | |
276 | 647 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) |
255 | 648 |
649 def parents(ui, repo, node = None): | |
650 '''show the parents of the current working dir''' | |
651 if node: | |
652 p = repo.changelog.parents(repo.lookup(hg.bin(node))) | |
653 else: | |
654 p = repo.dirstate.parents() | |
655 | |
656 for n in p: | |
657 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
|
658 show_changeset(ui, repo, changenode=n) |
255 | 659 |
404 | 660 def pull(ui, repo, source="default", **opts): |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
661 """pull changes from the specified source""" |
506 | 662 source = ui.expandpath(source) |
404 | 663 |
664 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
|
665 |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
666 other = hg.repository(ui, source) |
516 | 667 fetch = repo.findincoming(other) |
522
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
518
diff
changeset
|
668 if not fetch: |
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
518
diff
changeset
|
669 ui.status("no changes found\n") |
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
518
diff
changeset
|
670 return |
2f1de824798a
Fix empty pull bug that appeared this morning
mpm@selenic.com
parents:
518
diff
changeset
|
671 |
516 | 672 cg = other.changegroup(fetch) |
404 | 673 r = repo.addchangegroup(cg) |
674 if cg and not r: | |
675 if opts['update']: | |
676 return update(ui, repo) | |
580 | 677 else: |
404 | 678 ui.status("(run 'hg update' to get a working copy)\n") |
679 | |
680 return r | |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
681 |
371
6e3436082697
hg push: "default-push" default target path
mpm@selenic.com
parents:
367
diff
changeset
|
682 def push(ui, repo, dest="default-push"): |
319 | 683 """push changes to the specified destination""" |
506 | 684 dest = ui.expandpath(dest) |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
685 |
319 | 686 if not dest.startswith("ssh://"): |
687 ui.warn("abort: can only push to ssh:// destinations currently\n") | |
688 return 1 | |
689 | |
690 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest) | |
691 if not m: | |
692 ui.warn("abort: couldn't parse destination %s\n" % dest) | |
693 return 1 | |
694 | |
695 user, host, port, path = map(m.group, (2, 3, 5, 7)) | |
526 | 696 uhost = user and ("%s@%s" % (user, host)) or host |
319 | 697 port = port and (" -p %s") % port or "" |
698 path = path or "" | |
699 | |
700 sport = random.randrange(30000, 60000) | |
701 cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'" | |
526 | 702 cmd = cmd % (uhost, port, sport+1, sport, path, sport+1) |
319 | 703 |
704 child = os.fork() | |
705 if not child: | |
706 sys.stdout = file("/dev/null", "w") | |
707 sys.stderr = sys.stdout | |
708 hgweb.server(repo.root, "pull", "", "localhost", sport) | |
709 else: | |
526 | 710 ui.status("connecting to %s\n" % host) |
319 | 711 r = os.system(cmd) |
712 os.kill(child, signal.SIGTERM) | |
320 | 713 return r |
319 | 714 |
403 | 715 def rawcommit(ui, repo, *flist, **rc): |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
716 "raw commit interface" |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
717 |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
718 text = rc['text'] |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
719 if not text and rc['logfile']: |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
720 try: text = open(rc['logfile']).read() |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
721 except IOError: pass |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
722 if not text and not rc['logfile']: |
582 | 723 ui.warn("abort: missing commit text\n") |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
724 return 1 |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
725 |
403 | 726 files = relpath(repo, list(flist)) |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
727 if rc['files']: |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
728 files += open(rc['files']).read().splitlines() |
452
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
729 |
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
730 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
|
731 |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
732 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
733 |
245 | 734 def recover(ui, repo): |
255 | 735 """roll back an interrupted transaction""" |
245 | 736 repo.recover() |
737 | |
738 def remove(ui, repo, file, *files): | |
739 """remove the specified files on the next commit""" | |
740 repo.remove(relpath(repo, (file,) + files)) | |
741 | |
588 | 742 def revert(ui, repo, *names, **opts): |
743 """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
|
744 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
|
745 repo.dirstate.parents()[0] |
588 | 746 root = os.path.realpath(repo.root) |
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
747 |
588 | 748 def trimpath(p): |
749 p = os.path.realpath(p) | |
750 if p.startswith(root): | |
751 rest = p[len(root):] | |
752 if not rest: | |
753 return rest | |
754 if p.startswith(os.sep): | |
755 return rest[1:] | |
756 return p | |
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
757 |
588 | 758 relnames = map(trimpath, names or [os.getcwd()]) |
759 chosen = {} | |
590
38d106db75bc
hg revert should revert to parent, not to tip
mpm@selenic.com
parents:
588
diff
changeset
|
760 |
588 | 761 def choose(name): |
762 def body(name): | |
763 for r in relnames: | |
764 if not name.startswith(r): continue | |
765 rest = name[len(r):] | |
766 if not rest: return r, True | |
767 depth = rest.count(os.sep) | |
768 if not r: | |
769 if depth == 0 or not opts['nonrecursive']: return r, True | |
770 elif rest[0] == os.sep: | |
771 if depth == 1 or not opts['nonrecursive']: return r, True | |
772 return None, False | |
773 relname, ret = body(name) | |
774 if ret: | |
775 chosen[relname] = 1 | |
776 return ret | |
777 | |
778 r = repo.update(node, False, True, choose, False) | |
779 for n in relnames: | |
780 if n not in chosen: | |
781 ui.warn('error: no matches for %s\n' % n) | |
782 r = 1 | |
783 sys.stdout.flush() | |
784 return r | |
785 | |
468 | 786 def root(ui, repo): |
787 """print the root (top) of the current working dir""" | |
788 ui.write(repo.root + "\n") | |
789 | |
245 | 790 def serve(ui, repo, **opts): |
255 | 791 """export the repository via HTTP""" |
245 | 792 hgweb.server(repo.root, opts["name"], opts["templates"], |
793 opts["address"], opts["port"]) | |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
794 |
213 | 795 def status(ui, repo): |
796 '''show changed files in the working directory | |
797 | |
245 | 798 C = changed |
799 A = added | |
800 R = removed | |
801 ? = not tracked''' | |
312 | 802 |
537 | 803 (c, a, d, u) = repo.changes(None, None) |
220 | 804 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) |
213 | 805 |
582 | 806 for f in c: ui.write("C ", f, "\n") |
807 for f in a: ui.write("A ", f, "\n") | |
808 for f in d: ui.write("R ", f, "\n") | |
809 for f in u: ui.write("? ", f, "\n") | |
213 | 810 |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
811 def tag(ui, repo, name, rev = None, **opts): |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
812 """add a tag for the current tip or a given revision""" |
500
ebc4714a7632
[PATCH] Clean up destination directory if a clone fails.
mpm@selenic.com
parents:
499
diff
changeset
|
813 |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
814 if name == "tip": |
580 | 815 ui.warn("abort: 'tip' is a reserved name!\n") |
816 return -1 | |
817 if name.find(revrangesep) >= 0: | |
818 ui.warn("abort: '%s' cannot be used in a tag name\n" % revrangesep) | |
819 return -1 | |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
820 |
536 | 821 (c, a, d, u) = repo.changes(None, None) |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
822 for x in (c, a, d, u): |
580 | 823 if ".hgtags" in x: |
824 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
|
825 ui.status("(please commit .hgtags manually)\n") |
580 | 826 return -1 |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
827 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
828 if rev: |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
829 r = hg.hex(repo.lookup(rev)) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
830 else: |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
831 r = hg.hex(repo.changelog.tip()) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
832 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
833 add = 0 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
834 if not os.path.exists(repo.wjoin(".hgtags")): add = 1 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
835 repo.wfile(".hgtags", "a").write("%s %s\n" % (r, name)) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
836 if add: repo.add([".hgtags"]) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
837 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
838 if not opts['text']: |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
839 opts['text'] = "Added tag %s for changeset %s" % (name, r) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
840 |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
841 repo.commit([".hgtags"], opts['text'], opts['user'], opts['date']) |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
842 |
248 | 843 def tags(ui, repo): |
255 | 844 """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
|
845 |
343 | 846 l = repo.tagslist() |
847 l.reverse() | |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
848 for t, n in l: |
248 | 849 try: |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
850 r = "%5d:%s" % (repo.changelog.rev(n), hg.hex(n)) |
248 | 851 except KeyError: |
477
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
852 r = " ?:?" |
520540fd6b64
Handle errors in .hgtags or hgrc [tags] section more gracefully.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
470
diff
changeset
|
853 ui.write("%-30s %s\n" % (t, r)) |
248 | 854 |
245 | 855 def tip(ui, repo): |
255 | 856 """show the tip revision""" |
245 | 857 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
|
858 show_changeset(ui, repo, changenode=n) |
245 | 859 |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
860 def undo(ui, repo): |
255 | 861 """undo the last transaction""" |
210 | 862 repo.undo() |
863 | |
275 | 864 def update(ui, repo, node=None, merge=False, clean=False): |
254 | 865 '''update or merge working directory |
866 | |
867 If there are no outstanding changes in the working directory and | |
868 there is a linear relationship between the current version and the | |
869 requested version, the result is the requested version. | |
870 | |
871 Otherwise the result is a merge between the contents of the | |
872 current working directory and the requested version. Files that | |
873 changed between either parent are marked as changed for the next | |
874 commit and a commit must be performed before any further updates | |
875 are allowed. | |
876 ''' | |
877 node = node and repo.lookup(node) or repo.changelog.tip() | |
275 | 878 return repo.update(node, allow=merge, force=clean) |
254 | 879 |
247 | 880 def verify(ui, repo): |
881 """verify the integrity of the repository""" | |
882 return repo.verify() | |
883 | |
255 | 884 # Command options and aliases are listed here, alphabetically |
885 | |
209 | 886 table = { |
593 | 887 "^add": (add, [], "hg add [files]"), |
353 | 888 "addremove": (addremove, [], "hg addremove [files]"), |
437 | 889 "annotate": (annotate, |
209 | 890 [('r', 'revision', '', 'revision'), |
891 ('u', 'user', None, 'show user'), | |
892 ('n', 'number', None, 'show revision number'), | |
893 ('c', 'changeset', None, 'show changeset')], | |
894 'hg annotate [-u] [-c] [-n] [-r id] [files]'), | |
437 | 895 "cat": (cat, [], 'hg cat <file> [rev]'), |
593 | 896 "^clone": (clone, [('U', 'noupdate', None, 'skip update after cloning')], |
485 | 897 'hg clone [options] <source> [dest]'), |
593 | 898 "^commit|ci": (commit, |
289 | 899 [('t', 'text', "", 'commit text'), |
354 | 900 ('A', 'addremove', None, 'run add/remove during commit'), |
317 | 901 ('l', 'logfile', "", 'commit text file'), |
591 | 902 ('d', 'date', "", 'date code'), |
317 | 903 ('u', 'user', "", 'user')], |
289 | 904 'hg commit [files]'), |
363 | 905 "copy": (copy, [], 'hg copy <source> <dest>'), |
460 | 906 "debugcheckdirstate": (debugcheckdirstate, [], 'debugcheckdirstate'), |
907 "debugdumpdirstate": (debugdumpdirstate, [], 'debugdumpdirstate'), | |
248 | 908 "debugindex": (debugindex, [], 'debugindex <file>'), |
909 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'), | |
593 | 910 "^diff": (diff, [('r', 'rev', [], 'revision')], |
245 | 911 'hg diff [-r A] [-r B] [files]'), |
580 | 912 "export": (export, [('o', 'output', "", 'output to file')], |
913 "hg export [-o file] <changeset> ..."), | |
245 | 914 "forget": (forget, [], "hg forget [files]"), |
915 "heads": (heads, [], 'hg heads'), | |
916 "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
|
917 "identify|id": (identify, [], 'hg identify'), |
437 | 918 "import|patch": (import_, |
919 [('p', 'strip', 1, 'path strip'), | |
920 ('b', 'base', "", 'base path')], | |
921 "hg import [options] <patches>"), | |
593 | 922 "^init": (init, [], 'hg init'), |
923 "^log|history": (log, | |
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
924 [('r', 'rev', [], 'revision')], |
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
547
diff
changeset
|
925 'hg log [-r A] [-r B] [file]'), |
437 | 926 "manifest": (manifest, [], 'hg manifest [rev]'), |
227 | 927 "parents": (parents, [], 'hg parents [node]'), |
593 | 928 "^pull": (pull, |
404 | 929 [('u', 'update', None, 'update working directory')], |
580 | 930 'hg pull [options] [source]'), |
593 | 931 "^push": (push, [], 'hg push <destination>'), |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
932 "rawcommit": (rawcommit, |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
933 [('p', 'parent', [], 'parent'), |
591 | 934 ('d', 'date', "", 'date code'), |
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
935 ('u', 'user', "", 'user'), |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
936 ('F', 'files', "", 'file list'), |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
937 ('t', 'text', "", 'commit text'), |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
938 ('l', 'logfile', "", 'commit text file')], |
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
939 'hg rawcommit [options] [files]'), |
245 | 940 "recover": (recover, [], "hg recover"), |
593 | 941 "^remove|rm": (remove, [], "hg remove [files]"), |
588 | 942 "revert": (revert, |
943 [("n", "nonrecursive", None, "don't recurse into subdirs"), | |
944 ("r", "rev", "", "revision")], | |
945 "hg revert [files|dirs]"), | |
468 | 946 "root": (root, [], "hg root"), |
593 | 947 "^serve": (serve, [('p', 'port', 8000, 'listen port'), |
245 | 948 ('a', 'address', '', 'interface address'), |
949 ('n', 'name', os.getcwd(), 'repository name'), | |
950 ('t', 'templates', "", 'template map')], | |
951 "hg serve [options]"), | |
593 | 952 "^status": (status, [], 'hg status'), |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
953 "tag": (tag, [('t', 'text', "", 'commit text'), |
591 | 954 ('d', 'date', "", 'date code'), |
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
955 ('u', 'user', "", 'user')], |
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
956 'hg tag [options] <name> [rev]'), |
248 | 957 "tags": (tags, [], 'hg tags'), |
245 | 958 "tip": (tip, [], 'hg tip'), |
210 | 959 "undo": (undo, [], 'hg undo'), |
593 | 960 "^update|up|checkout|co": |
437 | 961 (update, |
962 [('m', 'merge', None, 'allow merging of conflicts'), | |
963 ('C', 'clean', None, 'overwrite locally modified files')], | |
964 'hg update [options] [node]'), | |
247 | 965 "verify": (verify, [], 'hg verify'), |
470
0ab093b473c5
Fix up version module name and command conflict
mpm@selenic.com
parents:
468
diff
changeset
|
966 "version": (show_version, [], 'hg version'), |
209 | 967 } |
968 | |
485 | 969 norepo = "clone init version help debugindex debugindexdot" |
209 | 970 |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
971 def find(cmd): |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
972 for e in table.keys(): |
335 | 973 if re.match("(%s)$" % e, cmd): |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
974 return table[e] |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
975 |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
976 raise UnknownCommand(cmd) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
977 |
214 | 978 class SignalInterrupt(Exception): pass |
979 | |
980 def catchterm(*args): | |
981 raise SignalInterrupt | |
982 | |
249 | 983 def run(): |
984 sys.exit(dispatch(sys.argv[1:])) | |
985 | |
209 | 986 def dispatch(args): |
592 | 987 signal.signal(signal.SIGTERM, catchterm) |
988 | |
989 def get_ui(): | |
990 return ui.ui(options["verbose"], options["debug"], options["quiet"], | |
991 not options["noninteractive"]) | |
992 | |
209 | 993 options = {} |
994 opts = [('v', 'verbose', None, 'verbose'), | |
591 | 995 ('', 'debug', None, 'debug'), |
209 | 996 ('q', 'quiet', None, 'quiet'), |
577
5291a16324c0
Remove -p global switch in preparation for combining namespaces
mpm@selenic.com
parents:
562
diff
changeset
|
997 ('', 'profile', None, 'profile'), |
517 | 998 ('R', 'repository', "", 'repository root directory'), |
527 | 999 ('', 'traceback', None, 'print traceback on exception'), |
209 | 1000 ('y', 'noninteractive', None, 'run non-interactively'), |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
1001 ('', 'version', None, 'output version information and exit'), |
209 | 1002 ] |
1003 | |
592 | 1004 try: |
1005 args = fancyopts.fancyopts(args, opts, options, | |
1006 'hg [options] <command> [options] [files]') | |
1007 except fancyopts.getopt.GetoptError, inst: | |
1008 u = ui.ui() | |
1009 u.warn("hg: %s\n" % (inst)) | |
1010 sys.exit(-1) | |
209 | 1011 |
1012 if not args: | |
1013 cmd = "help" | |
1014 else: | |
1015 cmd, args = args[0], args[1:] | |
1016 | |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
1017 if options["version"]: |
592 | 1018 show_version(get_ui()) |
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
1019 sys.exit(0) |
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
1020 |
252 | 1021 try: |
1022 i = find(cmd) | |
1023 except UnknownCommand: | |
592 | 1024 u = get_ui() |
268 | 1025 u.warn("hg: unknown command '%s'\n" % cmd) |
252 | 1026 help(u) |
1027 sys.exit(1) | |
209 | 1028 |
592 | 1029 # combine global options into local |
1030 c = list(i[1]) | |
1031 l = len(c) | |
1032 for o in opts: | |
1033 c.append((o[0], o[1], options[o[1]], o[3])) | |
214 | 1034 |
209 | 1035 cmdoptions = {} |
293 | 1036 try: |
592 | 1037 args = fancyopts.fancyopts(args, c, cmdoptions, i[2]) |
293 | 1038 except fancyopts.getopt.GetoptError, inst: |
592 | 1039 u = get_ui() |
293 | 1040 u.warn("hg %s: %s\n" % (cmd, inst)) |
1041 help(u, cmd) | |
1042 sys.exit(-1) | |
209 | 1043 |
592 | 1044 # separate global options back out |
1045 for o in opts: | |
1046 n = o[1] | |
1047 options[n] = cmdoptions[n] | |
1048 del cmdoptions[n] | |
1049 | |
1050 u = get_ui() | |
1051 | |
499 | 1052 try: |
527 | 1053 try: |
1054 if cmd not in norepo.split(): | |
1055 path = options["repository"] or "" | |
1056 repo = hg.repository(ui=u, path=path) | |
1057 d = lambda: i[0](u, repo, *args, **cmdoptions) | |
1058 else: | |
1059 d = lambda: i[0](u, *args, **cmdoptions) | |
209 | 1060 |
527 | 1061 if options['profile']: |
1062 import hotshot, hotshot.stats | |
1063 prof = hotshot.Profile("hg.prof") | |
1064 r = prof.runcall(d) | |
1065 prof.close() | |
1066 stats = hotshot.stats.load("hg.prof") | |
1067 stats.strip_dirs() | |
1068 stats.sort_stats('time', 'calls') | |
1069 stats.print_stats(40) | |
1070 return r | |
1071 else: | |
1072 return d() | |
1073 except: | |
1074 if options['traceback']: | |
1075 traceback.print_exc() | |
1076 raise | |
508 | 1077 except util.CommandError, inst: |
1078 u.warn("abort: %s\n" % inst.args) | |
499 | 1079 except hg.RepoError, inst: |
1080 u.warn("abort: ", inst, "!\n") | |
214 | 1081 except SignalInterrupt: |
1082 u.warn("killed!\n") | |
209 | 1083 except KeyboardInterrupt: |
1084 u.warn("interrupted!\n") | |
250 | 1085 except IOError, inst: |
395 | 1086 if hasattr(inst, "code"): |
1087 u.warn("abort: %s\n" % inst) | |
1088 elif hasattr(inst, "reason"): | |
1089 u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1])) | |
1090 elif hasattr(inst, "args") and inst[0] == errno.EPIPE: | |
250 | 1091 u.warn("broken pipe\n") |
1092 else: | |
1093 raise | |
549 | 1094 except OSError, inst: |
1095 if hasattr(inst, "filename"): | |
1096 u.warn("abort: %s: %s\n" % (inst.strerror, inst.filename)) | |
1097 else: | |
1098 u.warn("abort: %s\n" % inst.strerror) | |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1099 except TypeError, inst: |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1100 # was this an argument error? |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1101 tb = traceback.extract_tb(sys.exc_info()[2]) |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1102 if len(tb) > 2: # no |
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1103 raise |
293 | 1104 u.debug(inst, "\n") |
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
1105 u.warn("%s: invalid arguments\n" % i[0].__name__) |
293 | 1106 help(u, cmd) |
1107 | |
503
c6a2e41c8c60
Fix troubles with clone and exception handling
mpm@selenic.com
parents:
500
diff
changeset
|
1108 sys.exit(-1) |