mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:c03f58e5fd2d
+:20a44c82795f
 to = repo.file(f).read(mmap[f])
 tn = ""
 sys.stdout.write(mdiff.unidiff(to, date1, tn, date2, f))
 def help(ui, cmd=None):
-'''show help'''
+'''show help for a given command or all commands'''
 if cmd:
 try:
 i = find(cmd)
 ui.write("%s\n\n" % i[2])
 ui.write(i[0].__doc__, "\n")
 except UnknownCommand:
 ui.warn("unknown command %s" % cmd)
 sys.exit(0)
+else:
-ui.status("""\
+ui.status('hg commands:\n\n')
-hg commands:
+h = {}
-add [files...]        add the given files in the next commit
+for e in table.values():
-addremove             add all new files, delete all missing files
+f = e[0]
-annotate [files...]   show changeset number per file line
+if f.__name__.startswith("debug"): continue
-branch <path>         create a branch of <path> in this directory
+d = ""
-checkout [changeset]  checkout the latest or given changeset
+if f.__doc__:
-commit                commit all changes to the repository
+d = f.__doc__.splitlines(0)[0].rstrip()
-diff [files...]       diff working directory (or selected files)
+h[f.__name__] = d
-dump <file> [rev]     dump the latest or given revision of a file
-dumpmanifest [rev]    dump the latest or given revision of the manifest
+fns = h.keys()
-export <rev>          dump the changeset header and diffs for a revision
+fns.sort()
-history               show changeset history
+m = max(map(len, fns))
-init                  create a new repository in this directory
+for f in fns:
-log <file>            show revision history of a single file
+ui.status(' %-*s   %s\n' % (m, f, h[f]))
-merge <path>          merge changes from <path> into local repository
-recover               rollback an interrupted transaction
+# Commands start here, listed alphabetically
-remove [files...]     remove the given files in the next commit
-serve                 export the repository via HTTP
-status                show new, missing, and changed files in working dir
-tags                  show current changeset tags
-undo                  undo the last transaction
-""")
 def add(ui, repo, file, *files):
 '''add the specified files on the next commit'''
 repo.add(relpath(repo, (file,) + files))
 def addremove(ui, repo):
+"""add all new files, delete all missing files"""
 (c, a, d, u) = repo.diffdir(repo.root)
 repo.add(a)
 repo.remove(d)
 def annotate(u, repo, file, *files, **ops):
+"""show changeset information per file line"""
 def getnode(rev):
 return hg.short(repo.changelog.node(rev))
 def getname(rev):
 try:
 '''branch from a local repository'''
 # this should eventually support remote repos
 os.system("cp -al %s/.hg .hg" % path)
 def cat(ui, repo, file, rev = []):
+"""output the latest or given revision of a file"""
 r = repo.file(file)
 n = r.tip()
 if rev: n = r.lookup(rev)
 sys.stdout.write(r.read(n))
 if e[5] != hg.nullid:
 print "\t%d -> %d" % (r.rev(e[5]), i)
 print "}"
 def diff(ui, repo, *files, **opts):
+"""diff working directory (or selected files)"""
 revs = []
 if opts['rev']:
 revs = map(lambda x: repo.lookup(x), opts['rev'])
 if len(revs) > 2:
 files = relpath(repo, [""])
 dodiff(repo, files, *revs)
 def export(ui, repo, changeset):
+"""dump the changeset header and diffs for a revision"""
 node = repo.lookup(changeset)
 prev, other = repo.changelog.parents(node)
 change = repo.changelog.read(node)
 print "# HG changeset patch"
 print "# User %s" % change[1]
 time.localtime(float(changes[2].split(' ')[0])))
 if ui.verbose: print "files:", " ".join(changes[3])
 print "description:"
 print changes[4]
-def patch(ui, repo, patches, opts):
-"""import an ordered set of patches"""
-try:
-import psyco
-psyco.full()
-except:
-pass
-d = opts["base"]
-strip = opts["strip"]
-quiet = opts["quiet"] and "> /dev/null" or ""
-for patch in patches:
-ui.status("applying %s\n" % patch)
-pf = os.path.join(d, patch)
-text = ""
-for l in file(pf):
-if l[:4] == "--- ": break
-text += l
-f = os.popen("lsdiff --strip %d %s" % (strip, pf))
-files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
-f.close()
-if files:
-if os.system("patch -p%d < %s %s" % (strip, pf, quiet)):
-raise "patch failed!"
-repo.commit(files, text)
 def init(ui):
 """create a repository"""
 hg.repository(ui, ".", create=1)
 def log(ui, repo, f):
+"""show the revision history of a single file"""
 f = relpath(repo, [f])[0]
 r = repo.file(f)
 for i in range(r.count()):
 n = r.node(i)
 print "description:"
 print changes[4].rstrip()
 print
 def manifest(ui, repo, rev = []):
+"""output the latest or given revision of the project manifest"""
 n = repo.manifest.tip()
 if rev:
 n = repo.manifest.lookup(rev)
 m = repo.manifest.read(n)
 files = m.keys()
 p = repo.dirstate.parents()
 for n in p:
 if n != hg.nullid:
 ui.write("%d:%s\n" % (repo.changelog.rev(n), hg.hex(n)))
+def patch(ui, repo, patches, opts):
+"""import an ordered set of patches"""
+try:
+import psyco
+psyco.full()
+except:
+pass
+d = opts["base"]
+strip = opts["strip"]
+quiet = opts["quiet"] and "> /dev/null" or ""
+for patch in patches:
+ui.status("applying %s\n" % patch)
+pf = os.path.join(d, patch)
+text = ""
+for l in file(pf):
+if l[:4] == "--- ": break
+text += l
+f = os.popen("lsdiff --strip %d %s" % (strip, pf))
+files = filter(None, map(lambda x: x.rstrip(), f.read().splitlines()))
+f.close()
+if files:
+if os.system("patch -p%d < %s %s" % (strip, pf, quiet)):
+raise "patch failed!"
+repo.commit(files, text)
 def pull(ui, repo, source):
 """pull changes from the specified source"""
 paths = {}
 try:
 files += open(rc['files']).read().splitlines()
 repo.rawcommit(files, text, rc['user'], rc['date'], *rc['parent'])
 def recover(ui, repo):
+"""roll back an interrupted transaction"""
 repo.recover()
 def remove(ui, repo, file, *files):
 """remove the specified files on the next commit"""
 repo.remove(relpath(repo, (file,) + files))
 def serve(ui, repo, **opts):
+"""export the repository via HTTP"""
 from mercurial import hgweb
 hgweb.server(repo.root, opts["name"], opts["templates"],
 opts["address"], opts["port"])
 def status(ui, repo):
 for f in a: print "A", f
 for f in d: print "R", f
 for f in u: print "?", f
 def tags(ui, repo):
+"""list repository tags"""
 repo.lookup(0) # prime the cache
 i = repo.tags.items()
 i.sort()
 for k, n in i:
 try:
 except KeyError:
 r = "?"
 print "%-30s %5d:%s" % (k, repo.changelog.rev(n), hg.hex(n))
 def tip(ui, repo):
+"""show the tip revision"""
 n = repo.changelog.tip()
 t = repo.changelog.rev(n)
 ui.status("%d:%s\n" % (t, hg.hex(n)))
 def undo(ui, repo):
+"""undo the last transaction"""
 repo.undo()
 def update(ui, repo, node=None):
 '''update or merge working directory
 repo.update(node)
 def verify(ui, repo):
 """verify the integrity of the repository"""
 return repo.verify()
+# Command options and aliases are listed here, alphabetically
 table = {
 "add": (add, [], "hg add [files]"),
 "addremove": (addremove, [], "hg addremove"),
 "ann|annotate": (annotate,

changeset 255	20a44c82795f
parent 254	c03f58e5fd2d
child 257	65dccc4555c2