Mercurial > hg > pyhgsh
annotate mercurial/commands.py @ 452:a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
rawcommit: do lookup of parents at the appropriate layer
manifest hash: fc4b2d4416d00da5db2f4659e42ecba2a96dba1e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCu2UoywK+sNU5EO8RApdDAJ9Vph6qVyzL++YeXyFC8HKf9ZhkGgCeNc0Y
j2AMu6aWmuLuy2XwztS8gms=
=f8mQ
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Thu, 23 Jun 2005 17:43:04 -0800 |
| parents | 470a83212dda |
| children | 6409d9a0df43 50da4bb9cab6 |
| 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: ] | |
|
419
28511fc21073
[PATCH] file seperator handling for the other 'OS'
mpm@selenic.com
parents:
417
diff
changeset
|
32 return [ util.pconvert(os.path.normpath(os.path.join(p, x))) for x in args ] |
| 209 | 33 return args |
| 245 | 34 |
|
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
|
35 def dodiff(ui, repo, path, files = None, node1 = None, node2 = None): |
| 245 | 36 def date(c): |
| 37 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | |
| 38 | |
| 39 if node2: | |
| 40 change = repo.changelog.read(node2) | |
| 41 mmap2 = repo.manifest.read(change[0]) | |
| 42 (c, a, d) = repo.diffrevs(node1, node2) | |
| 43 def read(f): return repo.file(f).read(mmap2[f]) | |
| 44 date2 = date(change) | |
| 45 else: | |
| 46 date2 = time.asctime() | |
| 312 | 47 (c, a, d, u) = repo.diffdir(path, node1) |
| 245 | 48 if not node1: |
| 49 node1 = repo.dirstate.parents()[0] | |
| 417 | 50 def read(f): return repo.wfile(f).read() |
| 245 | 51 |
|
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
|
52 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
|
53 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
|
54 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
|
55 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
|
56 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
|
57 |
| 245 | 58 change = repo.changelog.read(node1) |
| 59 mmap = repo.manifest.read(change[0]) | |
| 60 date1 = date(change) | |
| 61 | |
| 62 if files: | |
| 63 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
| 64 | |
| 65 for f in c: | |
| 275 | 66 to = None |
| 67 if f in mmap: | |
| 68 to = repo.file(f).read(mmap[f]) | |
| 245 | 69 tn = read(f) |
|
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
|
70 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
| 245 | 71 for f in a: |
|
264
4c1d7072d5cd
Attempt to make diff deal with null sources properly
mpm@selenic.com
parents:
262
diff
changeset
|
72 to = None |
| 245 | 73 tn = read(f) |
|
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
|
74 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f, r)) |
| 245 | 75 for f in d: |
| 76 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
|
77 tn = None |
|
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
|
78 sys.stdout.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
|
79 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
80 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
|
81 """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
|
82 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
|
83 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
|
84 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
|
85 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
|
86 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
|
87 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
|
88 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
|
89 else: |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
90 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
|
91 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
|
92 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
|
93 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
|
94 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
|
95 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
|
96 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
|
97 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
98 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
|
99 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
|
100 return |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
101 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
102 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
|
103 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
104 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
|
105 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
|
106 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
|
107 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
|
108 parents = [] |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
109 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
110 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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 else: |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
116 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
|
117 for tag in repo.nodetags(changenode): |
|
c07c6fb2f0a8
Show tags in hg history etc.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
386
diff
changeset
|
118 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
|
119 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
|
120 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
|
121 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
|
122 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
|
123 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
|
124 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
|
125 time.localtime(float(changes[2].split(' ')[0])))) |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
126 ui.note("files: %s\n" % " ".join(changes[3])) |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
127 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
|
128 if description: |
| 330 | 129 if ui.verbose: |
| 130 ui.status("description:\n") | |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
131 ui.status(description) |
|
365
f94d3632a323
One too many newlines in verbose output showed up in regression
mpm@selenic.com
parents:
363
diff
changeset
|
132 ui.status("\n") |
| 330 | 133 else: |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
134 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
|
135 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
|
136 |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
137 def show_version(ui): |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
138 """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
|
139 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
|
140 ui.status( |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
141 "\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
|
142 "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
|
143 "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
|
144 "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
|
145 ) |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
146 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
147 def help(ui, cmd=None): |
| 255 | 148 '''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
|
149 if cmd: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
150 try: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
151 i = find(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
152 ui.write("%s\n\n" % i[2]) |
| 293 | 153 |
| 154 if i[1]: | |
| 155 for s, l, d, c in i[1]: | |
| 156 opt=' ' | |
| 157 if s: opt = opt + '-' + s + ' ' | |
| 158 if l: opt = opt + '--' + l + ' ' | |
| 159 if d: opt = opt + '(' + str(d) + ')' | |
| 160 ui.write(opt, "\n") | |
| 161 if c: ui.write(' %s\n' % c) | |
| 162 ui.write("\n") | |
| 163 | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
164 ui.write(i[0].__doc__, "\n") |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
165 except UnknownCommand: |
| 268 | 166 ui.warn("hg: unknown command %s\n" % cmd) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
167 sys.exit(0) |
| 255 | 168 else: |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
169 if not ui.quiet: |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
170 show_version(ui) |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
171 ui.write('\n') |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
172 ui.write('hg commands:\n\n') |
| 209 | 173 |
| 255 | 174 h = {} |
| 175 for e in table.values(): | |
| 176 f = e[0] | |
| 177 if f.__name__.startswith("debug"): continue | |
| 178 d = "" | |
| 179 if f.__doc__: | |
| 180 d = f.__doc__.splitlines(0)[0].rstrip() | |
| 437 | 181 h[f.__name__.rstrip("_")] = d |
| 255 | 182 |
| 183 fns = h.keys() | |
| 184 fns.sort() | |
| 185 m = max(map(len, fns)) | |
| 186 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
|
187 ui.write(' %-*s %s\n' % (m, f, h[f])) |
| 255 | 188 |
| 189 # Commands start here, listed alphabetically | |
| 209 | 190 |
| 245 | 191 def add(ui, repo, file, *files): |
| 192 '''add the specified files on the next commit''' | |
| 193 repo.add(relpath(repo, (file,) + files)) | |
| 213 | 194 |
| 353 | 195 def addremove(ui, repo, *files): |
| 255 | 196 """add all new files, delete all missing files""" |
| 353 | 197 if files: |
| 198 files = relpath(repo, files) | |
| 199 d = [] | |
| 200 u = [] | |
| 201 for f in files: | |
| 202 p = repo.wjoin(f) | |
| 203 s = repo.dirstate.state(f) | |
| 204 isfile = os.path.isfile(p) | |
| 205 if s != 'r' and not isfile: | |
| 206 d.append(f) | |
| 207 elif s not in 'nmai' and isfile: | |
| 208 u.append(f) | |
| 209 else: | |
| 210 (c, a, d, u) = repo.diffdir(repo.root) | |
| 259 | 211 repo.add(u) |
| 245 | 212 repo.remove(d) |
|
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
213 |
| 245 | 214 def annotate(u, repo, file, *files, **ops): |
| 255 | 215 """show changeset information per file line""" |
| 209 | 216 def getnode(rev): |
| 217 return hg.short(repo.changelog.node(rev)) | |
| 218 | |
| 219 def getname(rev): | |
| 220 try: | |
| 221 return bcache[rev] | |
| 222 except KeyError: | |
| 223 cl = repo.changelog.read(repo.changelog.node(rev)) | |
| 224 name = cl[1] | |
| 225 f = name.find('@') | |
| 226 if f >= 0: | |
| 227 name = name[:f] | |
| 228 bcache[rev] = name | |
| 229 return name | |
| 230 | |
| 231 bcache = {} | |
| 232 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | |
| 233 if not ops['user'] and not ops['changeset']: | |
| 234 ops['number'] = 1 | |
| 235 | |
| 227 | 236 node = repo.dirstate.parents()[0] |
| 209 | 237 if ops['revision']: |
| 238 node = repo.changelog.lookup(ops['revision']) | |
| 239 change = repo.changelog.read(node) | |
| 240 mmap = repo.manifest.read(change[0]) | |
| 241 maxuserlen = 0 | |
| 242 maxchangelen = 0 | |
| 245 | 243 for f in relpath(repo, (file,) + files): |
| 209 | 244 lines = repo.file(f).annotate(mmap[f]) |
| 245 pieces = [] | |
| 246 | |
| 247 for o, f in opmap: | |
| 248 if ops[o]: | |
| 249 l = [ f(n) for n,t in lines ] | |
| 250 m = max(map(len, l)) | |
| 251 pieces.append([ "%*s" % (m, x) for x in l]) | |
| 252 | |
| 253 for p,l in zip(zip(*pieces), lines): | |
| 254 u.write(" ".join(p) + ": " + l[1]) | |
| 255 | |
| 248 | 256 def cat(ui, repo, file, rev = []): |
| 255 | 257 """output the latest or given revision of a file""" |
| 281 | 258 r = repo.file(relpath(repo, [file])[0]) |
| 248 | 259 n = r.tip() |
| 260 if rev: n = r.lookup(rev) | |
| 261 sys.stdout.write(r.read(n)) | |
| 262 | |
| 289 | 263 def commit(ui, repo, *files, **opts): |
| 245 | 264 """commit the specified files or all outstanding changes""" |
| 289 | 265 text = opts['text'] |
| 266 if not text and opts['logfile']: | |
| 267 try: text = open(opts['logfile']).read() | |
| 268 except IOError: pass | |
| 269 | |
| 354 | 270 if opts['addremove']: |
| 271 addremove(ui, repo, *files) | |
| 317 | 272 repo.commit(relpath(repo, files), text, opts['user'], opts['date']) |
| 245 | 273 |
| 363 | 274 def copy(ui, repo, source, dest): |
| 275 """mark a file as copied or renamed for the next commit""" | |
| 276 return repo.copy(*relpath(repo, (source, dest))) | |
| 277 | |
| 248 | 278 def debugindex(ui, file): |
| 417 | 279 r = hg.revlog(hg.opener(""), file, "") |
| 248 | 280 print " rev offset length base linkrev"+\ |
| 281 " p1 p2 nodeid" | |
| 282 for i in range(r.count()): | |
| 283 e = r.index[i] | |
| 284 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % ( | |
| 285 i, e[0], e[1], e[2], e[3], | |
| 286 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])) | |
| 287 | |
| 288 def debugindexdot(ui, file): | |
| 417 | 289 r = hg.revlog(hg.opener(""), file, "") |
| 248 | 290 print "digraph G {" |
| 291 for i in range(r.count()): | |
| 292 e = r.index[i] | |
| 293 print "\t%d -> %d" % (r.rev(e[4]), i) | |
| 294 if e[5] != hg.nullid: | |
| 295 print "\t%d -> %d" % (r.rev(e[5]), i) | |
| 296 print "}" | |
| 297 | |
| 245 | 298 def diff(ui, repo, *files, **opts): |
| 255 | 299 """diff working directory (or selected files)""" |
| 245 | 300 revs = [] |
| 301 if opts['rev']: | |
| 302 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
|
303 |
| 245 | 304 if len(revs) > 2: |
| 305 self.ui.warn("too many revisions to diff\n") | |
| 306 sys.exit(1) | |
| 307 | |
| 308 if files: | |
| 309 files = relpath(repo, files) | |
| 310 else: | |
| 311 files = relpath(repo, [""]) | |
| 312 | |
|
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
|
313 dodiff(ui, repo, os.getcwd(), files, *revs) |
| 245 | 314 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
315 def export(ui, repo, changeset): |
| 255 | 316 """dump the changeset header and diffs for a revision""" |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
317 node = repo.lookup(changeset) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
318 prev, other = repo.changelog.parents(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
319 change = repo.changelog.read(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
320 print "# HG changeset patch" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
321 print "# User %s" % change[1] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
322 print "# Node ID %s" % hg.hex(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
323 print "# Parent %s" % hg.hex(prev) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
324 print |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
325 if other != hg.nullid: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
326 print "# Parent %s" % hg.hex(other) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
327 print change[4].rstrip() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
328 print |
|
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
|
329 |
|
8f8bb77d560e
Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
395
diff
changeset
|
330 dodiff(ui, repo, "", None, prev, node) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
331 |
| 245 | 332 def forget(ui, repo, file, *files): |
| 333 """don't add the specified files on the next commit""" | |
| 334 repo.forget(relpath(repo, (file,) + files)) | |
| 335 | |
| 221 | 336 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
|
337 """show current repository heads""" |
| 221 | 338 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
|
339 show_changeset(ui, repo, changenode=n) |
| 221 | 340 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
341 def history(ui, repo): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
342 """show the changelog history""" |
|
270
5a80ed2158c8
Reverse order of hg log and hg history lists
mpm@selenic.com
parents:
268
diff
changeset
|
343 for i in range(repo.changelog.count() - 1, -1, -1): |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
344 show_changeset(ui, repo, rev=i) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
345 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
346 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
|
347 """print information about the working copy""" |
| 343 | 348 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
|
349 if not parents: |
| 343 | 350 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
|
351 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
|
352 |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
353 hexfunc = ui.verbose and hg.hex or hg.short |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
354 (c, a, d, u) = repo.diffdir(repo.root) |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
355 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
|
356 (c or a or d) and "+" or "")] |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
357 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
358 if not ui.quiet: |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
359 # multiple tags for a single parent separated by '/' |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
360 parenttags = ['/'.join(tags) |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
361 for tags in map(repo.nodetags, parents) if tags] |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
362 # tags for multiple parents separated by ' + ' |
|
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
363 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
|
364 |
|
386
494c8e3f47f3
Improvements for hg identify:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
371
diff
changeset
|
365 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
|
366 |
| 437 | 367 def import_(ui, repo, patch1, *patches, **opts): |
| 368 """import an ordered set of patches""" | |
| 369 try: | |
| 370 import psyco | |
| 371 psyco.full() | |
| 372 except: | |
| 373 pass | |
| 374 | |
| 375 patches = (patch1,) + patches | |
| 376 | |
| 377 d = opts["base"] | |
| 378 strip = opts["strip"] | |
| 379 quiet = ui.quiet and "> /dev/null" or "" | |
| 380 | |
| 381 for patch in patches: | |
| 382 ui.status("applying %s\n" % patch) | |
| 383 pf = os.path.join(d, patch) | |
| 384 | |
| 385 text = "" | |
| 386 for l in file(pf): | |
| 387 if l[:4] == "--- ": break | |
| 388 text += l | |
| 389 | |
| 390 # make sure text isn't empty | |
| 391 if not text: text = "imported patch %s\n" % patch | |
| 392 | |
| 393 f = os.popen("patch -p%d < %s" % (strip, pf)) | |
| 394 files = [] | |
| 395 for l in f.read().splitlines(): | |
| 396 l.rstrip('\r\n'); | |
| 397 if not quiet: | |
| 398 print l | |
| 399 if l[:14] == 'patching file ': | |
| 443 | 400 pf = l[14:] |
| 401 if pf not in files: | |
| 402 files.append(pf) | |
| 403 patcherr = f.close() | |
| 404 if patcherr: | |
| 405 sys.stderr.write("patch failed") | |
| 406 sys.exit(1) | |
| 437 | 407 |
| 408 if len(files) > 0: | |
| 409 addremove(ui, repo, *files) | |
| 410 repo.commit(files, text) | |
| 411 | |
| 393 | 412 def init(ui, source=None, **opts): |
| 290 | 413 """create a new repository or copy an existing one""" |
| 414 | |
| 415 if source: | |
| 416 paths = {} | |
| 417 for name, path in ui.configitems("paths"): | |
| 418 paths[name] = path | |
| 419 | |
| 420 if source in paths: source = paths[source] | |
| 255 | 421 |
| 290 | 422 link = 0 |
| 423 if not source.startswith("http://"): | |
| 424 d1 = os.stat(os.getcwd()).st_dev | |
| 425 d2 = os.stat(source).st_dev | |
| 426 if d1 == d2: link = 1 | |
| 427 | |
| 428 if link: | |
| 429 ui.debug("copying by hardlink\n") | |
| 430 os.system("cp -al %s/.hg .hg" % source) | |
| 300 | 431 try: |
| 432 os.remove(".hg/dirstate") | |
| 433 except: pass | |
| 338 | 434 |
| 435 repo = hg.repository(ui, ".") | |
| 436 | |
| 290 | 437 else: |
| 438 repo = hg.repository(ui, ".", create=1) | |
| 439 other = hg.repository(ui, source) | |
| 440 cg = repo.getchangegroup(other) | |
| 441 repo.addchangegroup(cg) | |
|
390
50aea13227a2
create .hg/hgrc with [paths] default entry only if source was given on hg init.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
387
diff
changeset
|
442 |
|
50aea13227a2
create .hg/hgrc with [paths] default entry only if source was given on hg init.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
387
diff
changeset
|
443 f = repo.opener("hgrc", "w") |
|
50aea13227a2
create .hg/hgrc with [paths] default entry only if source was given on hg init.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
387
diff
changeset
|
444 f.write("[paths]\n") |
|
50aea13227a2
create .hg/hgrc with [paths] default entry only if source was given on hg init.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
387
diff
changeset
|
445 f.write("default = %s\n" % source) |
| 393 | 446 |
| 447 if opts['update']: | |
| 448 update(ui, repo) | |
| 290 | 449 else: |
| 338 | 450 repo = hg.repository(ui, ".", create=1) |
| 451 | |
| 255 | 452 def log(ui, repo, f): |
| 453 """show the revision history of a single file""" | |
| 454 f = relpath(repo, [f])[0] | |
| 455 | |
| 456 r = repo.file(f) | |
|
270
5a80ed2158c8
Reverse order of hg log and hg history lists
mpm@selenic.com
parents:
268
diff
changeset
|
457 for i in range(r.count() - 1, -1, -1): |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
458 show_changeset(ui, repo, filelog=r, rev=i) |
| 255 | 459 |
| 460 def manifest(ui, repo, rev = []): | |
| 461 """output the latest or given revision of the project manifest""" | |
| 462 n = repo.manifest.tip() | |
| 463 if rev: | |
| 464 n = repo.manifest.lookup(rev) | |
| 465 m = repo.manifest.read(n) | |
| 276 | 466 mf = repo.manifest.readflags(n) |
| 255 | 467 files = m.keys() |
| 468 files.sort() | |
| 469 | |
| 470 for f in files: | |
| 276 | 471 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) |
| 255 | 472 |
| 473 def parents(ui, repo, node = None): | |
| 474 '''show the parents of the current working dir''' | |
| 475 if node: | |
| 476 p = repo.changelog.parents(repo.lookup(hg.bin(node))) | |
| 477 else: | |
| 478 p = repo.dirstate.parents() | |
| 479 | |
| 480 for n in p: | |
| 481 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
|
482 show_changeset(ui, repo, changenode=n) |
| 255 | 483 |
| 404 | 484 def pull(ui, repo, source="default", **opts): |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
485 """pull changes from the specified source""" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
486 paths = {} |
| 286 | 487 for name, path in ui.configitems("paths"): |
| 290 | 488 paths[name] = path |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
489 |
| 404 | 490 if source in paths: |
| 491 source = paths[source] | |
| 492 | |
| 493 ui.status('pulling from %s\n' % (source)) | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
494 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
495 other = hg.repository(ui, source) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
496 cg = repo.getchangegroup(other) |
| 404 | 497 r = repo.addchangegroup(cg) |
| 498 if cg and not r: | |
| 499 if opts['update']: | |
| 500 return update(ui, repo) | |
| 501 else: | |
| 502 ui.status("(run 'hg update' to get a working copy)\n") | |
| 503 | |
| 504 return r | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
505 |
|
371
6e3436082697
hg push: "default-push" default target path
mpm@selenic.com
parents:
367
diff
changeset
|
506 def push(ui, repo, dest="default-push"): |
| 319 | 507 """push changes to the specified destination""" |
| 508 paths = {} | |
| 509 for name, path in ui.configitems("paths"): | |
| 510 paths[name] = path | |
| 511 | |
| 512 if dest in paths: dest = paths[dest] | |
| 513 | |
| 514 if not dest.startswith("ssh://"): | |
| 515 ui.warn("abort: can only push to ssh:// destinations currently\n") | |
| 516 return 1 | |
| 517 | |
| 518 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest) | |
| 519 if not m: | |
| 520 ui.warn("abort: couldn't parse destination %s\n" % dest) | |
| 521 return 1 | |
| 522 | |
| 523 user, host, port, path = map(m.group, (2, 3, 5, 7)) | |
| 524 host = user and ("%s@%s" % (user, host)) or host | |
| 525 port = port and (" -p %s") % port or "" | |
| 526 path = path or "" | |
| 527 | |
| 528 sport = random.randrange(30000, 60000) | |
| 529 cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'" | |
| 530 cmd = cmd % (host, port, sport+1, sport, path, sport+1) | |
| 531 | |
| 532 child = os.fork() | |
| 533 if not child: | |
| 534 sys.stdout = file("/dev/null", "w") | |
| 535 sys.stderr = sys.stdout | |
| 536 hgweb.server(repo.root, "pull", "", "localhost", sport) | |
| 537 else: | |
| 538 r = os.system(cmd) | |
| 539 os.kill(child, signal.SIGTERM) | |
| 320 | 540 return r |
| 319 | 541 |
| 403 | 542 def rawcommit(ui, repo, *flist, **rc): |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
543 "raw commit interface" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
544 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
545 text = rc['text'] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
546 if not text and rc['logfile']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
547 try: text = open(rc['logfile']).read() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
548 except IOError: pass |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
549 if not text and not rc['logfile']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
550 print "missing commit text" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
551 return 1 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
552 |
| 403 | 553 files = relpath(repo, list(flist)) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
554 if rc['files']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
555 files += open(rc['files']).read().splitlines() |
|
452
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
556 |
|
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
557 rc['parent'] = map(repo.lookup, rc['parent']) |
|
a1e91c24dab5
rawcommit: do lookup of parents at the appropriate layer
mpm@selenic.com
parents:
443
diff
changeset
|
558 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
559 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
560 |
| 245 | 561 def recover(ui, repo): |
| 255 | 562 """roll back an interrupted transaction""" |
| 245 | 563 repo.recover() |
| 564 | |
| 565 def remove(ui, repo, file, *files): | |
| 566 """remove the specified files on the next commit""" | |
| 567 repo.remove(relpath(repo, (file,) + files)) | |
| 568 | |
| 569 def serve(ui, repo, **opts): | |
| 255 | 570 """export the repository via HTTP""" |
| 245 | 571 hgweb.server(repo.root, opts["name"], opts["templates"], |
| 572 opts["address"], opts["port"]) | |
| 573 | |
| 213 | 574 def status(ui, repo): |
| 575 '''show changed files in the working directory | |
| 576 | |
| 245 | 577 C = changed |
| 578 A = added | |
| 579 R = removed | |
| 580 ? = not tracked''' | |
| 312 | 581 |
| 582 (c, a, d, u) = repo.diffdir(os.getcwd()) | |
| 220 | 583 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) |
| 213 | 584 |
| 585 for f in c: print "C", f | |
| 220 | 586 for f in a: print "A", f |
| 213 | 587 for f in d: print "R", f |
| 220 | 588 for f in u: print "?", f |
| 213 | 589 |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
590 def tag(ui, repo, name, rev = None, **opts): |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
591 """add a tag for the current tip or a given revision""" |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
592 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
593 if name == "tip": |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
594 ui.warn("abort: 'tip' is a reserved name!\n") |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
595 return -1 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
596 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
597 (c, a, d, u) = repo.diffdir(repo.root) |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
598 for x in (c, a, d, u): |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
599 if ".hgtags" in x: |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
600 ui.warn("abort: working copy of .hgtags is changed!\n") |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
601 ui.status("(please commit .hgtags manually)\n") |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
602 return -1 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
603 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
604 if rev: |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
605 r = hg.hex(repo.lookup(rev)) |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
606 else: |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
607 r = hg.hex(repo.changelog.tip()) |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
608 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
609 add = 0 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
610 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
|
611 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
|
612 if add: repo.add([".hgtags"]) |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
613 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
614 if not opts['text']: |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
615 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
|
616 |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
617 repo.commit([".hgtags"], opts['text'], opts['user'], opts['date']) |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
618 |
| 248 | 619 def tags(ui, repo): |
| 255 | 620 """list repository tags""" |
| 343 | 621 |
| 622 l = repo.tagslist() | |
| 623 l.reverse() | |
| 624 for t,n in l: | |
| 248 | 625 try: |
| 626 r = repo.changelog.rev(n) | |
| 627 except KeyError: | |
| 628 r = "?" | |
| 343 | 629 print "%-30s %5d:%s" % (t, repo.changelog.rev(n), hg.hex(n)) |
| 248 | 630 |
| 245 | 631 def tip(ui, repo): |
| 255 | 632 """show the tip revision""" |
| 245 | 633 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
|
634 show_changeset(ui, repo, changenode=n) |
| 245 | 635 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
636 def undo(ui, repo): |
| 255 | 637 """undo the last transaction""" |
| 210 | 638 repo.undo() |
| 639 | |
| 275 | 640 def update(ui, repo, node=None, merge=False, clean=False): |
| 254 | 641 '''update or merge working directory |
| 642 | |
| 643 If there are no outstanding changes in the working directory and | |
| 644 there is a linear relationship between the current version and the | |
| 645 requested version, the result is the requested version. | |
| 646 | |
| 647 Otherwise the result is a merge between the contents of the | |
| 648 current working directory and the requested version. Files that | |
| 649 changed between either parent are marked as changed for the next | |
| 650 commit and a commit must be performed before any further updates | |
| 651 are allowed. | |
| 652 ''' | |
| 653 node = node and repo.lookup(node) or repo.changelog.tip() | |
| 275 | 654 return repo.update(node, allow=merge, force=clean) |
| 254 | 655 |
| 247 | 656 def verify(ui, repo): |
| 657 """verify the integrity of the repository""" | |
| 658 return repo.verify() | |
| 659 | |
| 255 | 660 # Command options and aliases are listed here, alphabetically |
| 661 | |
| 209 | 662 table = { |
| 245 | 663 "add": (add, [], "hg add [files]"), |
| 353 | 664 "addremove": (addremove, [], "hg addremove [files]"), |
| 437 | 665 "annotate": (annotate, |
| 209 | 666 [('r', 'revision', '', 'revision'), |
| 667 ('u', 'user', None, 'show user'), | |
| 668 ('n', 'number', None, 'show revision number'), | |
| 669 ('c', 'changeset', None, 'show changeset')], | |
| 670 'hg annotate [-u] [-c] [-n] [-r id] [files]'), | |
| 437 | 671 "cat": (cat, [], 'hg cat <file> [rev]'), |
| 289 | 672 "commit|ci": (commit, |
| 673 [('t', 'text', "", 'commit text'), | |
| 354 | 674 ('A', 'addremove', None, 'run add/remove during commit'), |
| 317 | 675 ('l', 'logfile', "", 'commit text file'), |
| 676 ('d', 'date', "", 'data'), | |
| 677 ('u', 'user', "", 'user')], | |
| 289 | 678 'hg commit [files]'), |
| 363 | 679 "copy": (copy, [], 'hg copy <source> <dest>'), |
| 248 | 680 "debugindex": (debugindex, [], 'debugindex <file>'), |
| 681 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'), | |
| 245 | 682 "diff": (diff, [('r', 'rev', [], 'revision')], |
| 683 'hg diff [-r A] [-r B] [files]'), | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
684 "export": (export, [], "hg export <changeset>"), |
| 245 | 685 "forget": (forget, [], "hg forget [files]"), |
| 686 "heads": (heads, [], 'hg heads'), | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
687 "history": (history, [], 'hg history'), |
| 245 | 688 "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
|
689 "identify|id": (identify, [], 'hg identify'), |
| 437 | 690 "import|patch": (import_, |
| 691 [('p', 'strip', 1, 'path strip'), | |
| 692 ('b', 'base', "", 'base path')], | |
| 693 "hg import [options] <patches>"), | |
| 393 | 694 "init": (init, [('u', 'update', None, 'update after init')], |
| 695 'hg init [options] [url]'), | |
| 245 | 696 "log": (log, [], 'hg log <file>'), |
| 437 | 697 "manifest": (manifest, [], 'hg manifest [rev]'), |
| 227 | 698 "parents": (parents, [], 'hg parents [node]'), |
| 437 | 699 "pull": (pull, |
| 404 | 700 [('u', 'update', None, 'update working directory')], |
| 701 'hg pull [options] [source]'), | |
| 319 | 702 "push": (push, [], 'hg push <destination>'), |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
703 "rawcommit": (rawcommit, |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
704 [('p', 'parent', [], 'parent'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
705 ('d', 'date', "", 'data'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
706 ('u', 'user', "", 'user'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
707 ('F', 'files', "", 'file list'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
708 ('t', 'text', "", 'commit text'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
709 ('l', 'logfile', "", 'commit text file')], |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
710 'hg rawcommit [options] [files]'), |
| 245 | 711 "recover": (recover, [], "hg recover"), |
| 437 | 712 "remove|rm": (remove, [], "hg remove [files]"), |
| 245 | 713 "serve": (serve, [('p', 'port', 8000, 'listen port'), |
| 714 ('a', 'address', '', 'interface address'), | |
| 715 ('n', 'name', os.getcwd(), 'repository name'), | |
| 716 ('t', 'templates', "", 'template map')], | |
| 717 "hg serve [options]"), | |
| 213 | 718 "status": (status, [], 'hg status'), |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
719 "tag": (tag, [('t', 'text', "", 'commit text'), |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
720 ('d', 'date', "", 'date'), |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
721 ('u', 'user', "", 'user')], |
|
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
396
diff
changeset
|
722 'hg tag [options] <name> [rev]'), |
| 248 | 723 "tags": (tags, [], 'hg tags'), |
| 245 | 724 "tip": (tip, [], 'hg tip'), |
| 210 | 725 "undo": (undo, [], 'hg undo'), |
| 437 | 726 "update|up|checkout|co": |
| 727 (update, | |
| 728 [('m', 'merge', None, 'allow merging of conflicts'), | |
| 729 ('C', 'clean', None, 'overwrite locally modified files')], | |
| 730 'hg update [options] [node]'), | |
| 247 | 731 "verify": (verify, [], 'hg verify'), |
| 209 | 732 } |
| 733 | |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
734 norepo = "init version help debugindex debugindexdot" |
| 209 | 735 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
736 def find(cmd): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
737 i = None |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
738 for e in table.keys(): |
| 335 | 739 if re.match("(%s)$" % e, cmd): |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
740 return table[e] |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
741 |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
742 raise UnknownCommand(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
743 |
| 214 | 744 class SignalInterrupt(Exception): pass |
| 745 | |
| 746 def catchterm(*args): | |
| 747 raise SignalInterrupt | |
| 748 | |
| 249 | 749 def run(): |
| 750 sys.exit(dispatch(sys.argv[1:])) | |
| 751 | |
| 209 | 752 def dispatch(args): |
| 753 options = {} | |
| 754 opts = [('v', 'verbose', None, 'verbose'), | |
| 755 ('d', 'debug', None, 'debug'), | |
| 756 ('q', 'quiet', None, 'quiet'), | |
| 309 | 757 ('p', 'profile', None, 'profile'), |
| 209 | 758 ('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
|
759 ('', 'version', None, 'output version information and exit'), |
| 209 | 760 ] |
| 761 | |
| 762 args = fancyopts.fancyopts(args, opts, options, | |
| 763 'hg [options] <command> [options] [files]') | |
| 764 | |
| 765 if not args: | |
| 766 cmd = "help" | |
| 767 else: | |
| 768 cmd, args = args[0], args[1:] | |
| 769 | |
| 770 u = ui.ui(options["verbose"], options["debug"], options["quiet"], | |
| 771 not options["noninteractive"]) | |
| 772 | |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
773 if options["version"]: |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
774 show_version(u) |
|
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
396
diff
changeset
|
775 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
|
776 |
| 252 | 777 try: |
| 778 i = find(cmd) | |
| 779 except UnknownCommand: | |
| 268 | 780 u.warn("hg: unknown command '%s'\n" % cmd) |
| 252 | 781 help(u) |
| 782 sys.exit(1) | |
| 209 | 783 |
| 214 | 784 signal.signal(signal.SIGTERM, catchterm) |
| 785 | |
| 209 | 786 cmdoptions = {} |
| 293 | 787 try: |
| 788 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2]) | |
| 789 except fancyopts.getopt.GetoptError, inst: | |
| 790 u.warn("hg %s: %s\n" % (cmd, inst)) | |
| 791 help(u, cmd) | |
| 792 sys.exit(-1) | |
| 209 | 793 |
| 794 if cmd not in norepo.split(): | |
| 795 repo = hg.repository(ui = u) | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
796 d = lambda: i[0](u, repo, *args, **cmdoptions) |
| 209 | 797 else: |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
798 d = lambda: i[0](u, *args, **cmdoptions) |
| 209 | 799 |
| 800 try: | |
| 309 | 801 if options['profile']: |
| 802 import hotshot, hotshot.stats | |
| 803 prof = hotshot.Profile("hg.prof") | |
| 804 r = prof.runcall(d) | |
| 805 prof.close() | |
| 806 stats = hotshot.stats.load("hg.prof") | |
| 807 stats.strip_dirs() | |
| 808 stats.sort_stats('time', 'calls') | |
| 809 stats.print_stats(40) | |
| 810 return r | |
| 811 else: | |
| 812 return d() | |
| 214 | 813 except SignalInterrupt: |
| 814 u.warn("killed!\n") | |
| 209 | 815 except KeyboardInterrupt: |
| 816 u.warn("interrupted!\n") | |
| 250 | 817 except IOError, inst: |
| 395 | 818 if hasattr(inst, "code"): |
| 819 u.warn("abort: %s\n" % inst) | |
| 820 elif hasattr(inst, "reason"): | |
| 821 u.warn("abort: error %d: %s\n" % (inst.reason[0], inst.reason[1])) | |
| 822 elif hasattr(inst, "args") and inst[0] == errno.EPIPE: | |
| 250 | 823 u.warn("broken pipe\n") |
| 824 else: | |
| 825 raise | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
826 except TypeError, inst: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
827 # was this an argument error? |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
828 tb = traceback.extract_tb(sys.exc_info()[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
829 if len(tb) > 2: # no |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
830 raise |
| 293 | 831 u.debug(inst, "\n") |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
832 u.warn("%s: invalid arguments\n" % i[0].__name__) |
| 293 | 833 help(u, cmd) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
834 sys.exit(-1) |
| 293 | 835 |