mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:1c0c413cccdd
+:c6b912f8b5b2
 else:
 (c, a, d, u) = repo.changes()
 repo.add(u)
 repo.remove(d)
-def annotate(u, repo, file1, *files, **ops):
+def annotate(ui, repo, file1, *files, **opts):
 """show changeset information per file line"""
 def getnode(rev):
 return hg.short(repo.changelog.node(rev))
 def getname(rev):
 bcache[rev] = name
 return name
 bcache = {}
 opmap = [['user', getname], ['number', str], ['changeset', getnode]]
-if not ops['user'] and not ops['changeset']:
+if not opts['user'] and not opts['changeset']:
-ops['number'] = 1
+opts['number'] = 1
-node = repo.dirstate.parents()[0]
+if opts['rev']:
-if ops['revision']:
+node = repo.changelog.lookup(opts['rev'])
-node = repo.changelog.lookup(ops['revision'])
+else:
+node = repo.dirstate.parents()[0]
 change = repo.changelog.read(node)
 mmap = repo.manifest.read(change[0])
 for f in relpath(repo, (file1,) + files):
 lines = repo.file(f).annotate(mmap[f])
 pieces = []
 for o, f in opmap:
-if ops[o]:
+if opts[o]:
 l = [f(n) for n, dummy in lines]
 m = max(map(len, l))
 pieces.append(["%*s" % (m, x) for x in l])
 for p, l in zip(zip(*pieces), lines):
-u.write(" ".join(p) + ": " + l[1])
+ui.write("%s: %s" % (" ".join(p), l[1]))
 def cat(ui, repo, file1, rev=None, **opts):
 """output the latest or given revision of a file"""
 r = repo.file(relpath(repo, [file1])[0])
 if rev:
 if opts['output'] and opts['output'] != '-':
 try:
 outname = make_filename(repo, repo.changelog, opts['output'],
 node=node, total=total, seqno=seqno,
 revwidth=revwidth)
+ui.note("Exporting patch to '%s'.\n" % outname)
 fp = open(outname, 'wb')
 except KeyError, inst:
 ui.warn("error: invalid format spec '%%%s' in output file name\n" %
 inst.args[0])
 sys.exit(1)
 files.sort()
 for f in files:
 ui.write("%40s %3s %s\n" % (hg.hex(m[f]), mf[f] and "755" or "644", f))
-def parents(ui, repo, node=None):
+def parents(ui, repo, rev=None):
-'''show the parents of the current working dir'''
+"""show the parents of the working dir or revision"""
-if node:
+if rev:
-p = repo.changelog.parents(repo.lookup(hg.bin(node)))
+p = repo.changelog.parents(repo.lookup(rev))
 else:
 p = repo.dirstate.parents()
 for n in p:
 if n != hg.nullid:
 if ".hgtags" in x:
 ui.warn("abort: working copy of .hgtags is changed!\n")
 ui.status("(please commit .hgtags manually)\n")
 return -1
-add = not os.path.exists(repo.wjoin(".hgtags"))
 repo.wfile(".hgtags", "ab").write("%s %s\n" % (r, name))
-if add:
+if repo.dirstate.state(".hgtags") == '?':
 repo.add([".hgtags"])
 if not opts['text']:
 opts['text'] = "Added tag %s for changeset %s" % (name, r)
 table = {
 "^add": (add,
 [('I', 'include', [], 'include path in search'),
 ('X', 'exclude', [], 'exclude path from search')],
-"hg add [options] [files]"),
+"hg add [OPTIONS] [FILES]"),
-"addremove": (addremove, [], "hg addremove [files]"),
+"addremove": (addremove, [], "hg addremove [FILES]"),
 "^annotate":
 (annotate,
-[('r', 'revision', '', 'revision'),
+[('r', 'rev', '', 'revision'),
 ('u', 'user', None, 'show user'),
 ('n', 'number', None, 'show revision number'),
 ('c', 'changeset', None, 'show changeset')],
-'hg annotate [-u] [-c] [-n] [-r id] [files]'),
+'hg annotate [-r REV] [-u] [-n] [-c] FILE...'),
 "cat":
 (cat,
 [('o', 'output', "", 'output to file')],
-'hg cat [-o outfile] <file> [rev]'),
+'hg cat [-o OUTFILE] FILE [REV]'),
 "^clone":
 (clone,
 [('U', 'noupdate', None, 'skip update after cloning')],
-'hg clone [options] <source> [dest]'),
+'hg clone [-U] SOURCE [DEST]'),
 "^commit|ci":
 (commit,
-[('t', 'text', "", 'commit text'),
+[('A', 'addremove', None, 'run add/remove during commit'),
-('A', 'addremove', None, 'run add/remove during commit'),
+('t', 'text', "", 'commit text'),
 ('l', 'logfile', "", 'commit text file'),
 ('d', 'date', "", 'date code'),
 ('u', 'user', "", 'user')],
-'hg commit [files]'),
+'hg commit [OPTION]... [FILE]...'),
-"copy": (copy, [], 'hg copy <source> <dest>'),
+"copy": (copy, [], 'hg copy SOURCE DEST'),
 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
 "debugstate": (debugstate, [], 'debugstate'),
-"debugindex": (debugindex, [], 'debugindex <file>'),
+"debugindex": (debugindex, [], 'debugindex FILE'),
-"debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
+"debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
 "^diff":
 (diff,
 [('r', 'rev', [], 'revision')],
-'hg diff [-r A] [-r B] [files]'),
+'hg diff [-r REV1 [-r REV2]] [FILE]...'),
 "^export":
 (export,
 [('o', 'output', "", 'output to file')],
-"hg export [-o file] <changeset> ..."),
+"hg export [-o OUTFILE] REV..."),
-"forget": (forget, [], "hg forget [files]"),
+"forget": (forget, [], "hg forget FILE..."),
 "heads": (heads, [], 'hg heads'),
-"help": (help_, [], 'hg help [command]'),
+"help": (help_, [], 'hg help [COMMAND]'),
 "identify|id": (identify, [], 'hg identify'),
 "import|patch":
 (import_,
 [('p', 'strip', 1, 'path strip'),
 ('b', 'base', "", 'base path')],
-"hg import [options] <patches>"),
+"hg import [-p NUM] [-b BASE] PATCH..."),
 "^init": (init, [], 'hg init'),
 "locate":
 (locate,
 [('0', 'print0', None, 'end records with NUL'),
 ('f', 'fullpath', None, 'print complete paths'),
 ('I', 'include', [], 'include path in search'),
 ('r', 'rev', '', 'revision'),
 ('X', 'exclude', [], 'exclude path from search')],
-'hg locate [options] [files]'),
+'hg locate [OPTION]... [PATTERN]...'),
 "^log|history":
 (log,
 [('r', 'rev', [], 'revision'),
 ('p', 'patch', None, 'show patch')],
-'hg log [-r A] [-r B] [-p] [file]'),
+'hg log [-r REV1 [-r REV2]] [-p] [FILE]'),
-"manifest": (manifest, [], 'hg manifest [rev]'),
+"manifest": (manifest, [], 'hg manifest [REV]'),
-"parents": (parents, [], 'hg parents [node]'),
+"parents": (parents, [], 'hg parents [REV]'),
 "^pull":
 (pull,
 [('u', 'update', None, 'update working directory')],
-'hg pull [options] [source]'),
+'hg pull [-u] [SOURCE]'),
-"^push": (push, [], 'hg push <destination>'),
+"^push": (push, [], 'hg push [DEST]'),
 "rawcommit":
 (rawcommit,
 [('p', 'parent', [], 'parent'),
 ('d', 'date', "", 'date code'),
 ('u', 'user', "", 'user'),
 ('F', 'files', "", 'file list'),
 ('t', 'text', "", 'commit text'),
 ('l', 'logfile', "", 'commit text file')],
-'hg rawcommit [options] [files]'),
+'hg rawcommit [OPTION]... [FILE]...'),
 "recover": (recover, [], "hg recover"),
-"^remove|rm": (remove, [], "hg remove [files]"),
+"^remove|rm": (remove, [], "hg remove FILE..."),
 "^revert":
 (revert,
 [("n", "nonrecursive", None, "don't recurse into subdirs"),
 ("r", "rev", "", "revision")],
-"hg revert [files|dirs]"),
+"hg revert [-n] [-r REV] NAME..."),
 "root": (root, [], "hg root"),
 "^serve":
 (serve,
 [('A', 'accesslog', '', 'access log file'),
 ('E', 'errorlog', '', 'error log file'),
 ('p', 'port', 8000, 'listen port'),
 ('a', 'address', '', 'interface address'),
 ('n', 'name', os.getcwd(), 'repository name'),
 ('', 'stdio', None, 'for remote clients'),
 ('t', 'templates', "", 'template map')],
-"hg serve [options]"),
+"hg serve [OPTION]..."),
 "^status": (status, [], 'hg status'),
 "tag":
 (tag,
 [('l', 'local', None, 'make the tag local'),
 ('t', 'text', "", 'commit text'),
 ('d', 'date', "", 'date code'),
 ('u', 'user', "", 'user')],
-'hg tag [options] <name> [rev]'),
+'hg tag [OPTION]... NAME [REV]'),
 "tags": (tags, [], 'hg tags'),
 "tip": (tip, [], 'hg tip'),
 "undo": (undo, [], 'hg undo'),
 "^update|up|checkout|co":
 (update,
 [('m', 'merge', None, 'allow merging of conflicts'),
 ('C', 'clean', None, 'overwrite locally modified files')],
-'hg update [options] [node]'),
+'hg update [-m] [-C] [REV]'),
 "verify": (verify, [], 'hg verify'),
 "version": (show_version, [], 'hg version'),
 }
 globalopts = [('v', 'verbose', None, 'verbose'),

changeset 725	c6b912f8b5b2
parent 724	1c0c413cccdd
parent 715	938dd667ca21
child 726	809a870a0e73