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