Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/commands.py @ 245:fef0f8e041aa
big heap of command clean-up work
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
big heap of command clean-up work
Migrate add, forget, remove, commit, diff, addremove, tip, log,
recover, and serve.
Fix up filterfiles, relfilter, and relpath to be a bit more bulletproof
Alphabetize functions and the command table
Make everything in commands.py relative-path aware
manifest hash: f0856031a7be4e49289677b467f29bcf24ebce4a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCof6gywK+sNU5EO8RAoW1AJsHu8vchPSjls7wVbvsq/UKlGhqtgCgtnnl
xSBxyf/TEVWjHIk3uTa8WSE=
=YPMl
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 04 Jun 2005 11:18:56 -0800 |
| parents | afe895fcc0d0 |
| children | 96cde50a746f |
| rev | line source |
|---|---|
| 245 | 1 import os, re, traceback, sys, signal, time, mdiff |
| 209 | 2 from mercurial import fancyopts, ui, hg |
| 3 | |
| 4 class UnknownCommand(Exception): pass | |
| 5 | |
| 245 | 6 def filterfiles(filters, files): |
| 7 l = [ x for x in files if x in filters ] | |
| 213 | 8 |
| 245 | 9 for t in filters: |
| 10 if t and t[-1] != os.sep: t += os.sep | |
| 11 l += [ x for x in files if x.startswith(t) ] | |
| 213 | 12 return l |
| 13 | |
| 245 | 14 def relfilter(repo, files): |
| 213 | 15 if os.getcwd() != repo.root: |
| 16 p = os.getcwd()[len(repo.root) + 1: ] | |
| 245 | 17 return filterfiles(p, files) |
| 18 return files | |
| 213 | 19 |
| 209 | 20 def relpath(repo, args): |
| 21 if os.getcwd() != repo.root: | |
| 22 p = os.getcwd()[len(repo.root) + 1: ] | |
| 245 | 23 return [ os.path.normpath(os.path.join(p, x)) for x in args ] |
| 209 | 24 return args |
| 245 | 25 |
| 26 def dodiff(repo, files = None, node1 = None, node2 = None): | |
| 27 def date(c): | |
| 28 return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | |
| 29 | |
| 30 if node2: | |
| 31 change = repo.changelog.read(node2) | |
| 32 mmap2 = repo.manifest.read(change[0]) | |
| 33 (c, a, d) = repo.diffrevs(node1, node2) | |
| 34 def read(f): return repo.file(f).read(mmap2[f]) | |
| 35 date2 = date(change) | |
| 36 else: | |
| 37 date2 = time.asctime() | |
| 38 (c, a, d, u) = repo.diffdir(repo.root, node1) | |
| 39 if not node1: | |
| 40 node1 = repo.dirstate.parents()[0] | |
| 41 def read(f): return file(os.path.join(repo.root, f)).read() | |
| 42 | |
| 43 change = repo.changelog.read(node1) | |
| 44 mmap = repo.manifest.read(change[0]) | |
| 45 date1 = date(change) | |
| 46 | |
| 47 if files: | |
| 48 c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
| 49 | |
| 50 for f in c: | |
| 51 to = repo.file(f).read(mmap[f]) | |
| 52 tn = read(f) | |
| 53 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 54 for f in a: | |
| 55 to = "" | |
| 56 tn = read(f) | |
| 57 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 58 for f in d: | |
| 59 to = repo.file(f).read(mmap[f]) | |
| 60 tn = "" | |
| 61 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f)) | |
| 209 | 62 |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
63 def help(ui, cmd=None): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
64 '''show help''' |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
65 if cmd: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
66 try: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
67 i = find(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
68 ui.write("%s\n\n" % i[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
69 ui.write(i[0].__doc__, "\n") |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
70 except UnknownCommand: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
71 ui.warn("unknown command %s", cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
72 sys.exit(0) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
73 |
| 209 | 74 ui.status("""\ |
| 75 hg commands: | |
| 76 | |
| 77 add [files...] add the given files in the next commit | |
| 78 addremove add all new files, delete all missing files | |
| 79 annotate [files...] show changeset number per file line | |
| 80 branch <path> create a branch of <path> in this directory | |
| 81 checkout [changeset] checkout the latest or given changeset | |
| 82 commit commit all changes to the repository | |
| 83 diff [files...] diff working directory (or selected files) | |
| 84 dump <file> [rev] dump the latest or given revision of a file | |
| 85 dumpmanifest [rev] dump the latest or given revision of the manifest | |
| 86 export <rev> dump the changeset header and diffs for a revision | |
| 87 history show changeset history | |
| 88 init create a new repository in this directory | |
| 89 log <file> show revision history of a single file | |
| 90 merge <path> merge changes from <path> into local repository | |
| 91 recover rollback an interrupted transaction | |
| 92 remove [files...] remove the given files in the next commit | |
| 93 serve export the repository via HTTP | |
| 94 status show new, missing, and changed files in working dir | |
| 95 tags show current changeset tags | |
| 96 undo undo the last transaction | |
| 97 """) | |
| 98 | |
| 245 | 99 def add(ui, repo, file, *files): |
| 100 '''add the specified files on the next commit''' | |
| 101 repo.add(relpath(repo, (file,) + files)) | |
| 213 | 102 |
| 245 | 103 def addremove(ui, repo): |
| 230 | 104 (c, a, d, u) = repo.diffdir(repo.root) |
| 245 | 105 repo.add(a) |
| 106 repo.remove(d) | |
|
219
8ff4532376a4
hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com
parents:
214
diff
changeset
|
107 |
| 245 | 108 def annotate(u, repo, file, *files, **ops): |
| 209 | 109 def getnode(rev): |
| 110 return hg.short(repo.changelog.node(rev)) | |
| 111 | |
| 112 def getname(rev): | |
| 113 try: | |
| 114 return bcache[rev] | |
| 115 except KeyError: | |
| 116 cl = repo.changelog.read(repo.changelog.node(rev)) | |
| 117 name = cl[1] | |
| 118 f = name.find('@') | |
| 119 if f >= 0: | |
| 120 name = name[:f] | |
| 121 bcache[rev] = name | |
| 122 return name | |
| 123 | |
| 124 bcache = {} | |
| 125 opmap = [['user', getname], ['number', str], ['changeset', getnode]] | |
| 126 if not ops['user'] and not ops['changeset']: | |
| 127 ops['number'] = 1 | |
| 128 | |
| 227 | 129 node = repo.dirstate.parents()[0] |
| 209 | 130 if ops['revision']: |
| 131 node = repo.changelog.lookup(ops['revision']) | |
| 132 change = repo.changelog.read(node) | |
| 133 mmap = repo.manifest.read(change[0]) | |
| 134 maxuserlen = 0 | |
| 135 maxchangelen = 0 | |
| 245 | 136 for f in relpath(repo, (file,) + files): |
| 209 | 137 lines = repo.file(f).annotate(mmap[f]) |
| 138 pieces = [] | |
| 139 | |
| 140 for o, f in opmap: | |
| 141 if ops[o]: | |
| 142 l = [ f(n) for n,t in lines ] | |
| 143 m = max(map(len, l)) | |
| 144 pieces.append([ "%*s" % (m, x) for x in l]) | |
| 145 | |
| 146 for p,l in zip(zip(*pieces), lines): | |
| 147 u.write(" ".join(p) + ": " + l[1]) | |
| 148 | |
| 245 | 149 def branch(ui, path): |
| 150 '''branch from a local repository''' | |
| 151 # this should eventually support remote repos | |
| 152 os.system("cp -al %s/.hg .hg" % path) | |
| 153 | |
| 154 def checkout(ui, repo, changeset=None): | |
| 155 '''checkout a given changeset or the current tip''' | |
| 156 (c, a, d, u) = repo.diffdir(repo.root) | |
| 157 if c or a or d: | |
| 158 ui.warn("aborting (outstanding changes in working directory)\n") | |
| 159 sys.exit(1) | |
| 160 | |
| 161 node = repo.changelog.tip() | |
| 162 if changeset: | |
| 163 node = repo.lookup(changeset) | |
| 164 repo.checkout(node) | |
| 165 | |
| 166 def commit(ui, repo, *files): | |
| 167 """commit the specified files or all outstanding changes""" | |
| 168 repo.commit(relpath(repo, files)) | |
| 169 | |
| 170 def diff(ui, repo, *files, **opts): | |
| 171 revs = [] | |
| 172 if opts['rev']: | |
| 173 revs = map(lambda x: repo.lookup(x), opts['rev']) | |
| 174 | |
| 175 if len(revs) > 2: | |
| 176 self.ui.warn("too many revisions to diff\n") | |
| 177 sys.exit(1) | |
| 178 | |
| 179 if files: | |
| 180 files = relpath(repo, files) | |
| 181 else: | |
| 182 files = relpath(repo, [""]) | |
| 183 | |
| 184 dodiff(repo, files, *revs) | |
| 185 | |
| 186 def forget(ui, repo, file, *files): | |
| 187 """don't add the specified files on the next commit""" | |
| 188 repo.forget(relpath(repo, (file,) + files)) | |
| 189 | |
| 221 | 190 def heads(ui, repo): |
| 191 '''show current repository heads''' | |
| 192 for n in repo.changelog.heads(): | |
| 193 i = repo.changelog.rev(n) | |
| 194 changes = repo.changelog.read(n) | |
| 195 (p1, p2) = repo.changelog.parents(n) | |
| 196 (h, h1, h2) = map(hg.hex, (n, p1, p2)) | |
| 197 (i1, i2) = map(repo.changelog.rev, (p1, p2)) | |
| 198 print "rev: %4d:%s" % (i, h) | |
| 199 print "parents: %4d:%s" % (i1, h1) | |
| 200 if i2: print " %4d:%s" % (i2, h2) | |
| 201 print "manifest: %4d:%s" % (repo.manifest.rev(changes[0]), | |
| 202 hg.hex(changes[0])) | |
| 203 print "user:", changes[1] | |
| 204 print "date:", time.asctime( | |
| 205 time.localtime(float(changes[2].split(' ')[0]))) | |
| 206 if ui.verbose: print "files:", " ".join(changes[3]) | |
| 207 print "description:" | |
| 208 print changes[4] | |
| 209 | |
| 245 | 210 def init(ui): |
| 211 """create a repository""" | |
| 212 hg.repository(ui, ".", create=1) | |
| 213 | |
| 214 def log(ui, repo, f): | |
| 215 f = relpath(repo, [f])[0] | |
| 216 | |
| 217 r = repo.file(f) | |
| 218 for i in range(r.count()): | |
| 219 n = r.node(i) | |
| 220 (p1, p2) = r.parents(n) | |
| 221 (h, h1, h2) = map(hg.hex, (n, p1, p2)) | |
| 222 (i1, i2) = map(r.rev, (p1, p2)) | |
| 223 cr = r.linkrev(n) | |
| 224 cn = hg.hex(repo.changelog.node(cr)) | |
| 225 print "rev: %4d:%s" % (i, h) | |
| 226 print "changeset: %4d:%s" % (cr, cn) | |
| 227 print "parents: %4d:%s" % (i1, h1) | |
| 228 if i2: print " %4d:%s" % (i2, h2) | |
| 229 changes = repo.changelog.read(repo.changelog.node(cr)) | |
| 230 print "user: %s" % changes[1] | |
| 231 print "date: %s" % time.asctime( | |
| 232 time.localtime(float(changes[2].split(' ')[0]))) | |
| 233 print "description:" | |
| 234 print changes[4].rstrip() | |
| 235 print | |
| 236 | |
| 227 | 237 def parents(ui, repo, node = None): |
| 238 '''show the parents of the current working dir''' | |
| 239 if node: | |
| 240 p = repo.changelog.parents(repo.lookup(hg.bin(node))) | |
| 241 else: | |
| 242 p = repo.dirstate.parents() | |
| 243 | |
| 244 for n in p: | |
| 245 if n != hg.nullid: | |
| 246 ui.write("%d:%s\n" % (repo.changelog.rev(n), hg.hex(n))) | |
| 247 | |
| 245 | 248 def recover(ui, repo): |
| 249 repo.recover() | |
| 250 | |
| 251 def remove(ui, repo, file, *files): | |
| 252 """remove the specified files on the next commit""" | |
| 253 repo.remove(relpath(repo, (file,) + files)) | |
| 254 | |
| 255 def resolve(ui, repo, node=None): | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
256 '''merge a given node or the current tip into the working dir''' |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
257 if not node: |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
258 node = repo.changelog.tip() |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
259 else: |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
260 node = repo.lookup(node) |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
261 repo.resolve(node) |
|
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
262 |
| 245 | 263 def serve(ui, repo, **opts): |
| 264 from mercurial import hgweb | |
| 265 hgweb.server(repo.root, opts["name"], opts["templates"], | |
| 266 opts["address"], opts["port"]) | |
| 267 | |
| 213 | 268 def status(ui, repo): |
| 269 '''show changed files in the working directory | |
| 270 | |
| 245 | 271 C = changed |
| 272 A = added | |
| 273 R = removed | |
| 274 ? = not tracked''' | |
| 275 | |
| 230 | 276 (c, a, d, u) = repo.diffdir(repo.root) |
| 220 | 277 (c, a, d, u) = map(lambda x: relfilter(repo, x), (c, a, d, u)) |
| 213 | 278 |
| 279 for f in c: print "C", f | |
| 220 | 280 for f in a: print "A", f |
| 213 | 281 for f in d: print "R", f |
| 220 | 282 for f in u: print "?", f |
| 213 | 283 |
| 245 | 284 def tip(ui, repo): |
| 285 n = repo.changelog.tip() | |
| 286 t = repo.changelog.rev(n) | |
| 287 ui.status("%d:%s\n" % (t, hg.hex(n))) | |
| 288 | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
289 def undo(ui, repo): |
| 210 | 290 repo.undo() |
| 291 | |
| 209 | 292 table = { |
| 245 | 293 "add": (add, [], "hg add [files]"), |
| 294 "addremove": (addremove, [], "hg addremove"), | |
| 209 | 295 "ann|annotate": (annotate, |
| 296 [('r', 'revision', '', 'revision'), | |
| 297 ('u', 'user', None, 'show user'), | |
| 298 ('n', 'number', None, 'show revision number'), | |
| 299 ('c', 'changeset', None, 'show changeset')], | |
| 300 'hg annotate [-u] [-c] [-n] [-r id] [files]'), | |
| 245 | 301 "branch|clone": (branch, [], 'hg branch [path]'), |
| 302 "checkout|co": (checkout, [], 'hg checkout [changeset]'), | |
| 303 "commit|ci": (commit, [], 'hg commit [files]'), | |
| 304 "diff": (diff, [('r', 'rev', [], 'revision')], | |
| 305 'hg diff [-r A] [-r B] [files]'), | |
| 306 "forget": (forget, [], "hg forget [files]"), | |
| 307 "heads": (heads, [], 'hg heads'), | |
| 308 "help": (help, [], 'hg help [command]'), | |
| 309 "init": (init, [], 'hg init'), | |
| 310 "log": (log, [], 'hg log <file>'), | |
| 227 | 311 "parents": (parents, [], 'hg parents [node]'), |
| 245 | 312 "recover": (recover, [], "hg recover"), |
| 313 "remove": (remove, [], "hg remove [files]"), | |
|
232
fc4a6e5b5812
hg resolve: merge a given node into the working directory
mpm@selenic.com
parents:
230
diff
changeset
|
314 "resolve": (resolve, [], 'hg resolve [node]'), |
| 245 | 315 "serve": (serve, [('p', 'port', 8000, 'listen port'), |
| 316 ('a', 'address', '', 'interface address'), | |
| 317 ('n', 'name', os.getcwd(), 'repository name'), | |
| 318 ('t', 'templates', "", 'template map')], | |
| 319 "hg serve [options]"), | |
| 213 | 320 "status": (status, [], 'hg status'), |
| 245 | 321 "tip": (tip, [], 'hg tip'), |
| 210 | 322 "undo": (undo, [], 'hg undo'), |
| 209 | 323 } |
| 324 | |
| 325 norepo = "init branch help" | |
| 326 | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
327 def find(cmd): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
328 i = None |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
329 for e in table.keys(): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
330 if re.match(e + "$", cmd): |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
331 return table[e] |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
332 |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
333 raise UnknownCommand(cmd) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
334 |
| 214 | 335 class SignalInterrupt(Exception): pass |
| 336 | |
| 337 def catchterm(*args): | |
| 338 raise SignalInterrupt | |
| 339 | |
| 209 | 340 def dispatch(args): |
| 341 options = {} | |
| 342 opts = [('v', 'verbose', None, 'verbose'), | |
| 343 ('d', 'debug', None, 'debug'), | |
| 344 ('q', 'quiet', None, 'quiet'), | |
| 345 ('y', 'noninteractive', None, 'run non-interactively'), | |
| 346 ] | |
| 347 | |
| 348 args = fancyopts.fancyopts(args, opts, options, | |
| 349 'hg [options] <command> [options] [files]') | |
| 350 | |
| 351 if not args: | |
| 352 cmd = "help" | |
| 353 else: | |
| 354 cmd, args = args[0], args[1:] | |
| 355 | |
| 356 u = ui.ui(options["verbose"], options["debug"], options["quiet"], | |
| 357 not options["noninteractive"]) | |
| 358 | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
359 # deal with unfound commands later |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
360 i = find(cmd) |
| 209 | 361 |
| 214 | 362 signal.signal(signal.SIGTERM, catchterm) |
| 363 | |
| 209 | 364 cmdoptions = {} |
| 365 args = fancyopts.fancyopts(args, i[1], cmdoptions, i[2]) | |
| 366 | |
| 367 if cmd not in norepo.split(): | |
| 368 repo = hg.repository(ui = u) | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
369 d = lambda: i[0](u, repo, *args, **cmdoptions) |
| 209 | 370 else: |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
371 d = lambda: i[0](u, *args, **cmdoptions) |
| 209 | 372 |
| 373 try: | |
| 374 d() | |
| 214 | 375 except SignalInterrupt: |
| 376 u.warn("killed!\n") | |
| 209 | 377 except KeyboardInterrupt: |
| 378 u.warn("interrupted!\n") | |
|
212
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
379 except TypeError, inst: |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
380 # was this an argument error? |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
381 tb = traceback.extract_tb(sys.exc_info()[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
382 if len(tb) > 2: # no |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
383 raise |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
384 u.warn("%s: invalid arguments\n" % i[0].__name__) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
385 u.warn("syntax: %s\n" % i[2]) |
|
48398a5353e3
commands: better argument processing, per-command help
mpm@selenic.com
parents:
211
diff
changeset
|
386 sys.exit(-1) |