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