Mercurial > hg > pyhgsh
annotate mercurial/commands.py @ 355:3e18360a8912
hg import: better file accounting
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg import: better file accounting
From: Chris Mason <mason@suse.com>
Change hg import to call hg addremove with the file list to make sure files
added/deleted by the patch are properly accounted for. Instead of using
lsdiff, the output of patch is parsed directly to find the file list.
manifest hash: defed8cb90d6f976fb47949ac03dc4b88870ba77
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsG1BywK+sNU5EO8RAvV9AJ9H25L5vdnZB1xpAakuN3tGuMfRfgCfdAgP
3xBc3S4F74/7DdS2GXRNhGw=
=oXXT
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Wed, 15 Jun 2005 10:02:41 -0800 |
| parents | e3667e3a18ac |
| children | ae96b7e1318d |
| rev | line source |
|---|---|
| 249 | 1 # commands.py - command processing for mercurial |
| 2 # | |
| 3 # Copyright 2005 Matt Mackall <mpm@selenic.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms | |
| 6 # of the GNU General Public License, incorporated herein by reference. | |
| 7 | |
| 262 | 8 import os, re, sys, signal |
| 9 import fancyopts, ui, hg | |
| 10 from demandload import * | |
| 319 | 11 demandload(globals(), "mdiff time hgweb traceback random signal") |
| 209 | 12 |
| 13 class UnknownCommand(Exception): pass | |
| 14 | |
| 245 | 15 def filterfiles(filters, files): |
| 16 l = [ x for x in files if x in filters ] | |
| 213 | 17 |
| 245 | 18 for t in filters: |
| 19 if t and t[-1] != os.sep: t += os.sep | |
| 20 l += [ x for x in files if x.startswith(t) ] | |
| 213 | 21 return l |
| 22 | |
| 245 | 23 def relfilter(repo, files): |
| 213 | 24 if os.getcwd() != repo.root: |
| 25 p = os.getcwd()[len(repo.root) + 1: ] | |
| 281 | 26 return filterfiles([p], files) |
| 245 | 27 return files |
| 213 | 28 |
| 209 | 29 def relpath(repo, args): |
| 30 if os.getcwd() != repo.root: | |
| 31 p = os.getcwd()[len(repo.root) + 1: ] | |
| 245 | 32 return [ os.path.normpath(os.path.join(p, x)) for x in args ] |
| 209 | 33 return args |
| 245 | 34 |
| 312 | 35 def dodiff(repo, path, files = None, node1 = None, node2 = None): |
| 245 | 36 def date(c): |
| 37 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | |
| 38 | |
| 39 if node2: | |
| 40 change = repo.changelog.read(node2) | |
| 41 mmap2 = repo.manifest.read(change[0]) | |
| 42 (c, a, d) = repo.diffrevs(node1, node2) | |
| 43 def read(f): return repo.file(f).read(mmap2[f]) | |
| 44 date2 = date(change) | |
| 45 else: | |
| 46 date2 = time.asctime() | |
| 312 | 47 (c, a, d, u) = repo.diffdir(path, node1) |
| 245 | 48 if not node1: |
| 49 node1 = repo.dirstate.parents()[0] | |
| 50 def read(f): return file(os.path.join(repo.root, f)).read() | |
| 51 | |
| 52 change = repo.changelog.read(node1) | |
| 53 mmap = repo.manifest.read(change[0]) | |
| 54 date1 = date(change) | |
| 55 | |
| 56 if files: | |
| 57 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
| 58 | |
| 59 for f in c: | |
| 275 | 60 to = None |
| 61 if f in mmap: | |
| 62 to = repo.file(f).read(mmap[f]) | |
| 245 | 63 tn = read(f) |
| 64 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 65 for f in a: | |
|
264
4c1d7072d5cd
Attempt to make diff deal with null sources properly
mpm@selenic.com
parents:
262
diff
changeset
|
66 to = None |
| 245 | 67 tn = read(f) |
| 68 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 69 for f in d: | |
| 70 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
|
71 tn = None |
| 245 | 72 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
73 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
74 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
|
75 """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
|
76 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
|
77 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
|
78 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
|
79 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
|
80 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
|
81 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
|
82 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
|
83 else: |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
84 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
|
85 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
|
86 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
|
87 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
|
88 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
|
89 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
|
90 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
|
91 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
92 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
|
93 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
|
94 return |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
95 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
96 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
|
97 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
98 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
|
99 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
|
100 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
|
101 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
|
102 parents = [] |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
103 |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
104 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
|
105 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
|
106 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
|
107 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
|
108 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
|
109 else: |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
110 ui.write("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
|
111 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
|
112 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
|
113 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
|
114 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
|
115 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
|
116 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
|
117 time.localtime(float(changes[2].split(' ')[0])))) |
|
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
118 ui.note("files: %s\n" % " ".join(changes[3])) |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
119 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
|
120 if description: |
| 330 | 121 if ui.verbose: |
| 122 ui.status("description:\n") | |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
123 ui.status(description) |
|
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
124 ui.status("\n\n") |
| 330 | 125 else: |
|
347
a0b2758edee7
Cleaned up show_changeset()
Thomas Arendsen Hein <thomas@intevation.de>
parents:
330
diff
changeset
|
126 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
|
127 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
|
128 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
129 def help(ui, cmd=None): |
| 255 | 130 '''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
|
131 if cmd: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
132 try: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
133 i = find(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
134 ui.write("%s\n\n" % i[2]) |
| 293 | 135 |
| 136 if i[1]: | |
| 137 for s, l, d, c in i[1]: | |
| 138 opt=' ' | |
| 139 if s: opt = opt + '-' + s + ' ' | |
| 140 if l: opt = opt + '--' + l + ' ' | |
| 141 if d: opt = opt + '(' + str(d) + ')' | |
| 142 ui.write(opt, "\n") | |
| 143 if c: ui.write(' %s\n' % c) | |
| 144 ui.write("\n") | |
| 145 | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
146 ui.write(i[0].__doc__, "\n") |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
147 except UnknownCommand: |
| 268 | 148 ui.warn("hg: unknown command %s\n" % cmd) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
149 sys.exit(0) |
| 255 | 150 else: |
| 151 ui.status('hg commands:\n\n') | |
| 209 | 152 |
| 255 | 153 h = {} |
| 154 for e in table.values(): | |
| 155 f = e[0] | |
| 156 if f.__name__.startswith("debug"): continue | |
| 157 d = "" | |
| 158 if f.__doc__: | |
| 159 d = f.__doc__.splitlines(0)[0].rstrip() | |
| 160 h[f.__name__] = d | |
| 161 | |
| 162 fns = h.keys() | |
| 163 fns.sort() | |
| 164 m = max(map(len, fns)) | |
| 165 for f in fns: | |
| 166 ui.status(' %-*s %s\n' % (m, f, h[f])) | |
| 167 | |
| 168 # Commands start here, listed alphabetically | |
| 209 | 169 |
| 245 | 170 def add(ui, repo, file, *files): |
| 171 '''add the specified files on the next commit''' | |
| 172 repo.add(relpath(repo, (file,) + files)) | |
| 213 | 173 |
| 353 | 174 def addremove(ui, repo, *files): |
| 255 | 175 """add all new files, delete all missing files""" |
| 353 | 176 if files: |
| 177 files = relpath(repo, files) | |
| 178 d = [] | |
| 179 u = [] | |
| 180 for f in files: | |
| 181 p = repo.wjoin(f) | |
| 182 s = repo.dirstate.state(f) | |
| 183 isfile = os.path.isfile(p) | |
| 184 if s != 'r' and not isfile: | |
| 185 d.append(f) | |
| 186 elif s not in 'nmai' and isfile: | |
| 187 u.append(f) | |
| 188 else: | |
| 189 (c, a, d, u) = repo.diffdir(repo.root) | |
| 259 | 190 repo.add(u) |
| 245 | 191 repo.remove(d) |
|
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
192 |
| 245 | 193 def annotate(u, repo, file, *files, **ops): |
| 255 | 194 """show changeset information per file line""" |
| 209 | 195 def getnode(rev): |
| 196 return hg.short(repo.changelog.node(rev)) | |
| 197 | |
| 198 def getname(rev): | |
| 199 try: | |
| 200 return bcache[rev] | |
| 201 except KeyError: | |
| 202 cl = repo.changelog.read(repo.changelog.node(rev)) | |
| 203 name = cl[1] | |
| 204 f = name.find('@') | |
| 205 if f >= 0: | |
| 206 name = name[:f] | |
| 207 bcache[rev] = name | |
| 208 return name | |
| 209 | |
| 210 bcache = {} | |
| 211 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | |
| 212 if not ops['user'] and not ops['changeset']: | |
| 213 ops['number'] = 1 | |
| 214 | |
| 227 | 215 node = repo.dirstate.parents()[0] |
| 209 | 216 if ops['revision']: |
| 217 node = repo.changelog.lookup(ops['revision']) | |
| 218 change = repo.changelog.read(node) | |
| 219 mmap = repo.manifest.read(change[0]) | |
| 220 maxuserlen = 0 | |
| 221 maxchangelen = 0 | |
| 245 | 222 for f in relpath(repo, (file,) + files): |
| 209 | 223 lines = repo.file(f).annotate(mmap[f]) |
| 224 pieces = [] | |
| 225 | |
| 226 for o, f in opmap: | |
| 227 if ops[o]: | |
| 228 l = [ f(n) for n,t in lines ] | |
| 229 m = max(map(len, l)) | |
| 230 pieces.append([ "%*s" % (m, x) for x in l]) | |
| 231 | |
| 232 for p,l in zip(zip(*pieces), lines): | |
| 233 u.write(" ".join(p) + ": " + l[1]) | |
| 234 | |
| 248 | 235 def cat(ui, repo, file, rev = []): |
| 255 | 236 """output the latest or given revision of a file""" |
| 281 | 237 r = repo.file(relpath(repo, [file])[0]) |
| 248 | 238 n = r.tip() |
| 239 if rev: n = r.lookup(rev) | |
| 240 sys.stdout.write(r.read(n)) | |
| 241 | |
| 289 | 242 def commit(ui, repo, *files, **opts): |
| 245 | 243 """commit the specified files or all outstanding changes""" |
| 289 | 244 text = opts['text'] |
| 245 if not text and opts['logfile']: | |
| 246 try: text = open(opts['logfile']).read() | |
| 247 except IOError: pass | |
| 248 | |
| 354 | 249 if opts['addremove']: |
| 250 addremove(ui, repo, *files) | |
| 317 | 251 repo.commit(relpath(repo, files), text, opts['user'], opts['date']) |
| 245 | 252 |
| 248 | 253 def debugaddchangegroup(ui, repo): |
| 254 data = sys.stdin.read() | |
| 255 repo.addchangegroup(data) | |
| 256 | |
| 257 def debugchangegroup(ui, repo, roots): | |
| 258 newer = repo.newer(map(repo.lookup, roots)) | |
| 259 for chunk in repo.changegroup(newer): | |
| 260 sys.stdout.write(chunk) | |
| 261 | |
| 262 def debugindex(ui, file): | |
| 263 r = hg.revlog(open, file, "") | |
| 264 print " rev offset length base linkrev"+\ | |
| 265 " p1 p2 nodeid" | |
| 266 for i in range(r.count()): | |
| 267 e = r.index[i] | |
| 268 print "% 6d % 9d % 7d % 6d % 7d %s.. %s.. %s.." % ( | |
| 269 i, e[0], e[1], e[2], e[3], | |
| 270 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])) | |
| 271 | |
| 272 def debugindexdot(ui, file): | |
| 273 r = hg.revlog(open, file, "") | |
| 274 print "digraph G {" | |
| 275 for i in range(r.count()): | |
| 276 e = r.index[i] | |
| 277 print "\t%d -> %d" % (r.rev(e[4]), i) | |
| 278 if e[5] != hg.nullid: | |
| 279 print "\t%d -> %d" % (r.rev(e[5]), i) | |
| 280 print "}" | |
| 281 | |
| 245 | 282 def diff(ui, repo, *files, **opts): |
| 255 | 283 """diff working directory (or selected files)""" |
| 245 | 284 revs = [] |
| 285 if opts['rev']: | |
| 286 revs = map(lambda x: repo.lookup(x), opts['rev']) | |
| 287 | |
| 288 if len(revs) > 2: | |
| 289 self.ui.warn("too many revisions to diff\n") | |
| 290 sys.exit(1) | |
| 291 | |
| 292 if files: | |
| 293 files = relpath(repo, files) | |
| 294 else: | |
| 295 files = relpath(repo, [""]) | |
| 296 | |
| 312 | 297 dodiff(repo, os.getcwd(), files, *revs) |
| 245 | 298 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
299 def export(ui, repo, changeset): |
| 255 | 300 """dump the changeset header and diffs for a revision""" |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
301 node = repo.lookup(changeset) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
302 prev, other = repo.changelog.parents(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
303 change = repo.changelog.read(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
304 print "# HG changeset patch" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
305 print "# User %s" % change[1] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
306 print "# Node ID %s" % hg.hex(node) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
307 print "# Parent %s" % hg.hex(prev) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
308 print |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
309 if other != hg.nullid: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
310 print "# Parent %s" % hg.hex(other) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
311 print change[4].rstrip() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
312 print |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
313 |
| 312 | 314 dodiff(repo, "", None, prev, node) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
315 |
| 245 | 316 def forget(ui, repo, file, *files): |
| 317 """don't add the specified files on the next commit""" | |
| 318 repo.forget(relpath(repo, (file,) + files)) | |
| 319 | |
| 221 | 320 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
|
321 """show current repository heads""" |
| 221 | 322 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
|
323 show_changeset(ui, repo, changenode=n) |
| 221 | 324 |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
325 def history(ui, repo): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
326 """show the changelog history""" |
|
270
5a80ed2158c8
Reverse order of hg log and hg history lists
mpm@selenic.com
parents:
268
diff
changeset
|
327 for i in range(repo.changelog.count() - 1, -1, -1): |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
328 show_changeset(ui, repo, rev=i) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
329 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
330 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
|
331 """print information about the working copy""" |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
332 (c, a, d, u) = repo.diffdir(repo.root) |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
333 mflag = (c or a or d or u) and "+" or "" |
| 343 | 334 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
|
335 if not parents: |
| 343 | 336 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
|
337 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
|
338 |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
339 tstring = '' |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
340 if not ui.quiet: |
| 343 | 341 tags = sum(map(repo.nodetags, parents), []) |
| 342 tstring = " " + ' + '.join(tags) | |
|
339
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
343 |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
344 hexfunc = ui.verbose and hg.hex or hg.short |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
345 pstring = '+'.join([hexfunc(parent) for parent in parents]) |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
346 ui.write("%s%s%s\n" % (pstring, mflag, tstring)) |
|
a76fc9c4b67b
added hg identify|id (based on a patch from Andrew Thompson)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
338
diff
changeset
|
347 |
| 290 | 348 def init(ui, source=None): |
| 349 """create a new repository or copy an existing one""" | |
| 350 | |
| 351 if source: | |
| 352 paths = {} | |
| 353 for name, path in ui.configitems("paths"): | |
| 354 paths[name] = path | |
| 355 | |
| 356 if source in paths: source = paths[source] | |
| 255 | 357 |
| 290 | 358 link = 0 |
| 359 if not source.startswith("http://"): | |
| 360 d1 = os.stat(os.getcwd()).st_dev | |
| 361 d2 = os.stat(source).st_dev | |
| 362 if d1 == d2: link = 1 | |
| 363 | |
| 364 if link: | |
| 365 ui.debug("copying by hardlink\n") | |
| 366 os.system("cp -al %s/.hg .hg" % source) | |
| 300 | 367 try: |
| 368 os.remove(".hg/dirstate") | |
| 369 except: pass | |
| 338 | 370 |
| 371 repo = hg.repository(ui, ".") | |
| 372 | |
| 290 | 373 else: |
| 374 repo = hg.repository(ui, ".", create=1) | |
| 375 other = hg.repository(ui, source) | |
| 376 cg = repo.getchangegroup(other) | |
| 377 repo.addchangegroup(cg) | |
| 378 else: | |
| 338 | 379 repo = hg.repository(ui, ".", create=1) |
| 380 | |
| 381 f = repo.opener("hgrc", "w") | |
| 382 f.write("[paths]\n") | |
| 383 f.write("default = %s\n" % source) | |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
384 |
| 255 | 385 def log(ui, repo, f): |
| 386 """show the revision history of a single file""" | |
| 387 f = relpath(repo, [f])[0] | |
| 388 | |
| 389 r = repo.file(f) | |
|
270
5a80ed2158c8
Reverse order of hg log and hg history lists
mpm@selenic.com
parents:
268
diff
changeset
|
390 for i in range(r.count() - 1, -1, -1): |
|
329
67c19ad374a9
Use common output function show_changeset() for hg heads|history|log|tip.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
320
diff
changeset
|
391 show_changeset(ui, repo, filelog=r, rev=i) |
| 255 | 392 |
| 393 def manifest(ui, repo, rev = []): | |
| 394 """output the latest or given revision of the project manifest""" | |
| 395 n = repo.manifest.tip() | |
| 396 if rev: | |
| 397 n = repo.manifest.lookup(rev) | |
| 398 m = repo.manifest.read(n) | |
| 276 | 399 mf = repo.manifest.readflags(n) |
| 255 | 400 files = m.keys() |
| 401 files.sort() | |
| 402 | |
| 403 for f in files: | |
| 276 | 404 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f)) |
| 255 | 405 |
| 406 def parents(ui, repo, node = None): | |
| 407 '''show the parents of the current working dir''' | |
| 408 if node: | |
| 409 p = repo.changelog.parents(repo.lookup(hg.bin(node))) | |
| 410 else: | |
| 411 p = repo.dirstate.parents() | |
| 412 | |
| 413 for n in p: | |
| 414 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
|
415 show_changeset(ui, repo, changenode=n) |
| 255 | 416 |
|
294
f8d56da6ac8f
hg patch: fix to actually take a list of patches
mpm@selenic.com
parents:
293
diff
changeset
|
417 def patch(ui, repo, patch1, *patches, **opts): |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
418 """import an ordered set of patches""" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
419 try: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
420 import psyco |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
421 psyco.full() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
422 except: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
423 pass |
|
294
f8d56da6ac8f
hg patch: fix to actually take a list of patches
mpm@selenic.com
parents:
293
diff
changeset
|
424 |
| 295 | 425 patches = (patch1,) + patches |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
426 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
427 d = opts["base"] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
428 strip = opts["strip"] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
429 quiet = opts["quiet"] and "> /dev/null" or "" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
430 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
431 for patch in patches: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
432 ui.status("applying %s\n" % patch) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
433 pf = os.path.join(d, patch) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
434 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
435 text = "" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
436 for l in file(pf): |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
437 if l[:4] == "--- ": break |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
438 text += l |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
439 |
| 310 | 440 # make sure text isn't empty |
| 441 if not text: text = "imported patch %s\n" % patch | |
| 442 | |
| 355 | 443 f = os.popen("patch -p%d < %s" % (strip, pf)) |
| 444 files = [] | |
| 445 for l in f.read().splitlines(): | |
| 446 l.rstrip('\r\n'); | |
| 447 if not quiet: | |
| 448 print l | |
| 449 if l[:14] == 'patching file ': | |
| 450 files.append(l[14:]) | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
451 f.close() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
452 |
| 355 | 453 if len(files) > 0: |
| 454 addremove(ui, repo, *files) | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
455 repo.commit(files, text) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
456 |
| 338 | 457 def pull(ui, repo, source="default"): |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
458 """pull changes from the specified source""" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
459 paths = {} |
| 286 | 460 for name, path in ui.configitems("paths"): |
| 290 | 461 paths[name] = path |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
462 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
463 if source in paths: source = paths[source] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
464 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
465 other = hg.repository(ui, source) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
466 cg = repo.getchangegroup(other) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
467 repo.addchangegroup(cg) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
468 |
| 319 | 469 def push(ui, repo, dest): |
| 470 """push changes to the specified destination""" | |
| 471 paths = {} | |
| 472 for name, path in ui.configitems("paths"): | |
| 473 paths[name] = path | |
| 474 | |
| 475 if dest in paths: dest = paths[dest] | |
| 476 | |
| 477 if not dest.startswith("ssh://"): | |
| 478 ui.warn("abort: can only push to ssh:// destinations currently\n") | |
| 479 return 1 | |
| 480 | |
| 481 m = re.match(r'ssh://(([^@]+)@)?([^:/]+)(:(\d+))?(/(.*))?', dest) | |
| 482 if not m: | |
| 483 ui.warn("abort: couldn't parse destination %s\n" % dest) | |
| 484 return 1 | |
| 485 | |
| 486 user, host, port, path = map(m.group, (2, 3, 5, 7)) | |
| 487 host = user and ("%s@%s" % (user, host)) or host | |
| 488 port = port and (" -p %s") % port or "" | |
| 489 path = path or "" | |
| 490 | |
| 491 sport = random.randrange(30000, 60000) | |
| 492 cmd = "ssh %s%s -R %d:localhost:%d 'cd %s; hg pull http://localhost:%d/'" | |
| 493 cmd = cmd % (host, port, sport+1, sport, path, sport+1) | |
| 494 | |
| 495 child = os.fork() | |
| 496 if not child: | |
| 497 sys.stdout = file("/dev/null", "w") | |
| 498 sys.stderr = sys.stdout | |
| 499 hgweb.server(repo.root, "pull", "", "localhost", sport) | |
| 500 else: | |
| 501 r = os.system(cmd) | |
| 502 os.kill(child, signal.SIGTERM) | |
| 320 | 503 return r |
| 319 | 504 |
| 333 | 505 def rawcommit(ui, repo, flist, **rc): |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
506 "raw commit interface" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
507 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
508 text = rc['text'] |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
509 if not text and rc['logfile']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
510 try: text = open(rc['logfile']).read() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
511 except IOError: pass |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
512 if not text and not rc['logfile']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
513 print "missing commit text" |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
514 return 1 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
515 |
| 333 | 516 files = relpath(repo, flist) |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
517 if rc['files']: |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
518 files += open(rc['files']).read().splitlines() |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
519 |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
520 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent']) |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
521 |
| 245 | 522 def recover(ui, repo): |
| 255 | 523 """roll back an interrupted transaction""" |
| 245 | 524 repo.recover() |
| 525 | |
| 526 def remove(ui, repo, file, *files): | |
| 527 """remove the specified files on the next commit""" | |
| 528 repo.remove(relpath(repo, (file,) + files)) | |
| 529 | |
| 530 def serve(ui, repo, **opts): | |
| 255 | 531 """export the repository via HTTP""" |
| 245 | 532 hgweb.server(repo.root, opts["name"], opts["templates"], |
| 533 opts["address"], opts["port"]) | |
| 534 | |
| 213 | 535 def status(ui, repo): |
| 536 '''show changed files in the working directory | |
| 537 | |
| 245 | 538 C = changed |
| 539 A = added | |
| 540 R = removed | |
| 541 ? = not tracked''' | |
| 312 | 542 |
| 543 (c, a, d, u) = repo.diffdir(os.getcwd()) | |
| 220 | 544 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) |
| 213 | 545 |
| 546 for f in c: print "C", f | |
| 220 | 547 for f in a: print "A", f |
| 213 | 548 for f in d: print "R", f |
| 220 | 549 for f in u: print "?", f |
| 213 | 550 |
| 248 | 551 def tags(ui, repo): |
| 255 | 552 """list repository tags""" |
| 343 | 553 |
| 554 l = repo.tagslist() | |
| 555 l.reverse() | |
| 556 for t,n in l: | |
| 248 | 557 try: |
| 558 r = repo.changelog.rev(n) | |
| 559 except KeyError: | |
| 560 r = "?" | |
| 343 | 561 print "%-30s %5d:%s" % (t, repo.changelog.rev(n), hg.hex(n)) |
| 248 | 562 |
| 245 | 563 def tip(ui, repo): |
| 255 | 564 """show the tip revision""" |
| 245 | 565 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
|
566 show_changeset(ui, repo, changenode=n) |
| 245 | 567 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
568 def undo(ui, repo): |
| 255 | 569 """undo the last transaction""" |
| 210 | 570 repo.undo() |
| 571 | |
| 275 | 572 def update(ui, repo, node=None, merge=False, clean=False): |
| 254 | 573 '''update or merge working directory |
| 574 | |
| 575 If there are no outstanding changes in the working directory and | |
| 576 there is a linear relationship between the current version and the | |
| 577 requested version, the result is the requested version. | |
| 578 | |
| 579 Otherwise the result is a merge between the contents of the | |
| 580 current working directory and the requested version. Files that | |
| 581 changed between either parent are marked as changed for the next | |
| 582 commit and a commit must be performed before any further updates | |
| 583 are allowed. | |
| 584 ''' | |
| 585 node = node and repo.lookup(node) or repo.changelog.tip() | |
| 275 | 586 return repo.update(node, allow=merge, force=clean) |
| 254 | 587 |
| 247 | 588 def verify(ui, repo): |
| 589 """verify the integrity of the repository""" | |
| 590 return repo.verify() | |
| 591 | |
| 255 | 592 # Command options and aliases are listed here, alphabetically |
| 593 | |
| 209 | 594 table = { |
| 245 | 595 "add": (add, [], "hg add [files]"), |
| 353 | 596 "addremove": (addremove, [], "hg addremove [files]"), |
| 209 | 597 "ann|annotate": (annotate, |
| 598 [('r', 'revision', '', 'revision'), | |
| 599 ('u', 'user', None, 'show user'), | |
| 600 ('n', 'number', None, 'show revision number'), | |
| 601 ('c', 'changeset', None, 'show changeset')], | |
| 602 'hg annotate [-u] [-c] [-n] [-r id] [files]'), | |
| 248 | 603 "cat|dump": (cat, [], 'hg cat <file> [rev]'), |
| 289 | 604 "commit|ci": (commit, |
| 605 [('t', 'text', "", 'commit text'), | |
| 354 | 606 ('A', 'addremove', None, 'run add/remove during commit'), |
| 317 | 607 ('l', 'logfile', "", 'commit text file'), |
| 608 ('d', 'date', "", 'data'), | |
| 609 ('u', 'user', "", 'user')], | |
| 289 | 610 'hg commit [files]'), |
| 248 | 611 "debugaddchangegroup": (debugaddchangegroup, [], 'debugaddchangegroup'), |
| 612 "debugchangegroup": (debugchangegroup, [], 'debugchangegroup [roots]'), | |
| 613 "debugindex": (debugindex, [], 'debugindex <file>'), | |
| 614 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'), | |
| 245 | 615 "diff": (diff, [('r', 'rev', [], 'revision')], |
| 616 'hg diff [-r A] [-r B] [files]'), | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
617 "export": (export, [], "hg export <changeset>"), |
| 245 | 618 "forget": (forget, [], "hg forget [files]"), |
| 619 "heads": (heads, [], 'hg heads'), | |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
620 "history": (history, [], 'hg history'), |
| 245 | 621 "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
|
622 "identify|id": (identify, [], 'hg identify'), |
| 290 | 623 "init": (init, [], 'hg init [url]'), |
| 245 | 624 "log": (log, [], 'hg log <file>'), |
| 248 | 625 "manifest|dumpmanifest": (manifest, [], 'hg manifest [rev]'), |
| 227 | 626 "parents": (parents, [], 'hg parents [node]'), |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
627 "patch|import": (patch, |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
628 [('p', 'strip', 1, 'path strip'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
629 ('b', 'base', "", 'base path'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
630 ('q', 'quiet', "", 'silence diff')], |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
631 "hg import [options] patches"), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
632 "pull|merge": (pull, [], 'hg pull [source]'), |
| 319 | 633 "push": (push, [], 'hg push <destination>'), |
|
246
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
634 "rawcommit": (rawcommit, |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
635 [('p', 'parent', [], 'parent'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
636 ('d', 'date', "", 'data'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
637 ('u', 'user', "", 'user'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
638 ('F', 'files', "", 'file list'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
639 ('t', 'text', "", 'commit text'), |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
640 ('l', 'logfile', "", 'commit text file')], |
|
96cde50a746f
Migrate rawcommit, import, export, history, and merge
mpm@selenic.com
parents:
245
diff
changeset
|
641 'hg rawcommit [options] [files]'), |
| 245 | 642 "recover": (recover, [], "hg recover"), |
| 643 "remove": (remove, [], "hg remove [files]"), | |
| 644 "serve": (serve, [('p', 'port', 8000, 'listen port'), | |
| 645 ('a', 'address', '', 'interface address'), | |
| 646 ('n', 'name', os.getcwd(), 'repository name'), | |
| 647 ('t', 'templates', "", 'template map')], | |
| 648 "hg serve [options]"), | |
| 213 | 649 "status": (status, [], 'hg status'), |
| 248 | 650 "tags": (tags, [], 'hg tags'), |
| 245 | 651 "tip": (tip, [], 'hg tip'), |
| 210 | 652 "undo": (undo, [], 'hg undo'), |
| 275 | 653 "update|up|checkout|co|resolve": (update, |
| 654 [('m', 'merge', None, | |
| 655 'allow merging of conflicts'), | |
| 656 ('C', 'clean', None, | |
| 657 'overwrite locally modified files')], | |
| 658 'hg update [options] [node]'), | |
| 247 | 659 "verify": (verify, [], 'hg verify'), |
| 209 | 660 } |
| 661 | |
| 248 | 662 norepo = "init branch help debugindex debugindexdot" |
| 209 | 663 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
664 def find(cmd): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
665 i = None |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
666 for e in table.keys(): |
| 335 | 667 if re.match("(%s)$" % e, cmd): |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
668 return table[e] |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
669 |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
670 raise UnknownCommand(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
671 |
| 214 | 672 class SignalInterrupt(Exception): pass |
| 673 | |
| 674 def catchterm(*args): | |
| 675 raise SignalInterrupt | |
| 676 | |
| 249 | 677 def run(): |
| 678 sys.exit(dispatch(sys.argv[1:])) | |
| 679 | |
| 209 | 680 def dispatch(args): |
| 681 options = {} | |
| 682 opts = [('v', 'verbose', None, 'verbose'), | |
| 683 ('d', 'debug', None, 'debug'), | |
| 684 ('q', 'quiet', None, 'quiet'), | |
| 309 | 685 ('p', 'profile', None, 'profile'), |
| 209 | 686 ('y', 'noninteractive', None, 'run non-interactively'), |
| 687 ] | |
| 688 | |
| 689 args = fancyopts.fancyopts(args, opts, options, | |
| 690 'hg [options] <command> [options] [files]') | |
| 691 | |
| 692 if not args: | |
| 693 cmd = "help" | |
| 694 else: | |
| 695 cmd, args = args[0], args[1:] | |
| 696 | |
| 697 u = ui.ui(options["verbose"], options["debug"], options["quiet"], | |
| 698 not options["noninteractive"]) | |
| 699 | |
| 252 | 700 try: |
| 701 i = find(cmd) | |
| 702 except UnknownCommand: | |
| 268 | 703 u.warn("hg: unknown command '%s'\n" % cmd) |
| 252 | 704 help(u) |
| 705 sys.exit(1) | |
| 209 | 706 |
| 214 | 707 signal.signal(signal.SIGTERM, catchterm) |
| 708 | |
| 209 | 709 cmdoptions = {} |
| 293 | 710 try: |
| 711 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2]) | |
| 712 except fancyopts.getopt.GetoptError, inst: | |
| 713 u.warn("hg %s: %s\n" % (cmd, inst)) | |
| 714 help(u, cmd) | |
| 715 sys.exit(-1) | |
| 209 | 716 |
| 717 if cmd not in norepo.split(): | |
| 718 repo = hg.repository(ui = u) | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
719 d = lambda: i[0](u, repo, *args, **cmdoptions) |
| 209 | 720 else: |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
721 d = lambda: i[0](u, *args, **cmdoptions) |
| 209 | 722 |
| 723 try: | |
| 309 | 724 if options['profile']: |
| 725 import hotshot, hotshot.stats | |
| 726 prof = hotshot.Profile("hg.prof") | |
| 727 r = prof.runcall(d) | |
| 728 prof.close() | |
| 729 stats = hotshot.stats.load("hg.prof") | |
| 730 stats.strip_dirs() | |
| 731 stats.sort_stats('time', 'calls') | |
| 732 stats.print_stats(40) | |
| 733 return r | |
| 734 else: | |
| 735 return d() | |
| 214 | 736 except SignalInterrupt: |
| 737 u.warn("killed!\n") | |
| 209 | 738 except KeyboardInterrupt: |
| 739 u.warn("interrupted!\n") | |
| 250 | 740 except IOError, inst: |
| 741 if inst.errno == 32: | |
| 742 u.warn("broken pipe\n") | |
| 743 else: | |
| 744 raise | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
745 except TypeError, inst: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
746 # was this an argument error? |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
747 tb = traceback.extract_tb(sys.exc_info()[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
748 if len(tb) > 2: # no |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
749 raise |
| 293 | 750 u.debug(inst, "\n") |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
751 u.warn("%s: invalid arguments\n" % i[0].__name__) |
| 293 | 752 help(u, cmd) |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
753 sys.exit(-1) |
| 293 | 754 |