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