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