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