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

equal deleted inserted replaced

-:6aeb4fee51f6
+:5b38a5af4019
 f = e[0]
 if f.__name__.startswith("debug"): continue
 d = ""
 if f.__doc__:
 d = f.__doc__.splitlines(0)[0].rstrip()
-h[f.__name__] = d
+h[f.__name__.rstrip("_")] = d
 fns = h.keys()
 fns.sort()
 m = max(map(len, fns))
 for f in fns:
 def copy(ui, repo, source, dest):
 """mark a file as copied or renamed for the next commit"""
 return repo.copy(*relpath(repo, (source, dest)))
-def debugaddchangegroup(ui, repo):
-data = sys.stdin.read()
-repo.addchangegroup(data)
-def debugchangegroup(ui, repo, roots):
-newer = repo.newer(map(repo.lookup, roots))
-for chunk in repo.changegroup(newer):
-sys.stdout.write(chunk)
 def debugindex(ui, file):
 r = hg.revlog(hg.opener(""), file, "")
 print "   rev    offset  length   base linkrev"+\
 " p1           p2           nodeid"
 for i in range(r.count()):
 # tags for multiple parents separated by ' + '
 output.append(' + '.join(parenttags))
 ui.write("%s\n" % ' '.join(output))
+def import_(ui, repo, patch1, *patches, **opts):
+"""import an ordered set of patches"""
+try:
+import psyco
+psyco.full()
+except:
+pass
+patches = (patch1,) + patches
+d = opts["base"]
+strip = opts["strip"]
+quiet = ui.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
+# make sure text isn't empty
+if not text: text = "imported patch %s\n" % patch
+f = os.popen("patch -p%d < %s" % (strip, pf))
+files = []
+for l in f.read().splitlines():
+l.rstrip('\r\n');
+if not quiet:
+print l
+if l[:14] == 'patching file ':
+files.append(l[14:])
+f.close()
+if len(files) > 0:
+addremove(ui, repo, *files)
+repo.commit(files, text)
 def init(ui, source=None, **opts):
 """create a new repository or copy an existing one"""
 if source:
 paths = {}
 p = repo.dirstate.parents()
 for n in p:
 if n != hg.nullid:
 show_changeset(ui, repo, changenode=n)
-def patch(ui, repo, patch1, *patches, **opts):
-"""import an ordered set of patches"""
-try:
-import psyco
-psyco.full()
-except:
-pass
-patches = (patch1,) + patches
-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
-# make sure text isn't empty
-if not text: text = "imported patch %s\n" % patch
-f = os.popen("patch -p%d < %s" % (strip, pf))
-files = []
-for l in f.read().splitlines():
-l.rstrip('\r\n');
-if not quiet:
-print l
-if l[:14] == 'patching file ':
-files.append(l[14:])
-f.close()
-if len(files) > 0:
-addremove(ui, repo, *files)
-repo.commit(files, text)
 def pull(ui, repo, source="default", **opts):
 """pull changes from the specified source"""
 paths = {}
 for name, path in ui.configitems("paths"):
 # Command options and aliases are listed here, alphabetically
 table = {
 "add": (add, [], "hg add [files]"),
 "addremove": (addremove, [], "hg addremove [files]"),
-"ann|annotate": (annotate,
+"annotate": (annotate,
 [('r', 'revision', '', '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]'),
-"cat|dump": (cat, [], 'hg cat <file> [rev]'),
+"cat": (cat, [], 'hg cat <file> [rev]'),
 "commit|ci": (commit,
 [('t', 'text', "", 'commit text'),
 ('A', 'addremove', None, 'run add/remove during commit'),
 ('l', 'logfile', "", 'commit text file'),
 ('d', 'date', "", 'data'),
 ('u', 'user', "", 'user')],
 'hg commit [files]'),
 "copy": (copy, [], 'hg copy <source> <dest>'),
-"debugaddchangegroup": (debugaddchangegroup, [], 'debugaddchangegroup'),
-"debugchangegroup": (debugchangegroup, [], 'debugchangegroup [roots]'),
 "debugindex": (debugindex, [], 'debugindex <file>'),
 "debugindexdot": (debugindexdot, [], 'debugindexdot <file>'),
 "diff": (diff, [('r', 'rev', [], 'revision')],
 'hg diff [-r A] [-r B] [files]'),
 "export": (export, [], "hg export <changeset>"),
 "forget": (forget, [], "hg forget [files]"),
 "heads": (heads, [], 'hg heads'),
 "history": (history, [], 'hg history'),
 "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>"),
 "init": (init, [('u', 'update', None, 'update after init')],
 'hg init [options] [url]'),
 "log": (log, [], 'hg log <file>'),
-"manifest|dumpmanifest": (manifest, [], 'hg manifest [rev]'),
+"manifest": (manifest, [], 'hg manifest [rev]'),
 "parents": (parents, [], 'hg parents [node]'),
-"patch|import": (patch,
+"pull": (pull,
-[('p', 'strip', 1, 'path strip'),
-('b', 'base', "", 'base path'),
-('q', 'quiet', "", 'silence diff')],
-"hg import [options] patches"),
-"pull|merge": (pull,
 [('u', 'update', None, 'update working directory')],
 		  'hg pull [options] [source]'),
 "push": (push, [], 'hg push <destination>'),
 "rawcommit": (rawcommit,
 [('p', 'parent', [], 'parent'),
 ('F', 'files', "", 'file list'),
 ('t', 'text', "", 'commit text'),
 ('l', 'logfile', "", 'commit text file')],
 'hg rawcommit [options] [files]'),
 "recover": (recover, [], "hg recover"),
-"remove": (remove, [], "hg remove [files]"),
+"remove|rm": (remove, [], "hg remove [files]"),
 "serve": (serve, [('p', 'port', 8000, 'listen port'),
 ('a', 'address', '', 'interface address'),
 ('n', 'name', os.getcwd(), 'repository name'),
 ('t', 'templates', "", 'template map')],
 "hg serve [options]"),
 ('u', 'user', "", 'user')],
 'hg tag [options] <name> [rev]'),
 "tags": (tags, [], 'hg tags'),
 "tip": (tip, [], 'hg tip'),
 "undo": (undo, [], 'hg undo'),
-"update|up|checkout|co|resolve": (update,
+"update|up|checkout|co":
-[('m', 'merge', None,
+(update,
-'allow merging of conflicts'),
+[('m', 'merge', None, 'allow merging of conflicts'),
-('C', 'clean', None,
+('C', 'clean', None, 'overwrite locally modified files')],
-'overwrite locally modified files')],
+'hg update [options] [node]'),
-'hg update [options] [node]'),
 "verify": (verify, [], 'hg verify'),
 }
 norepo = "init version help debugindex debugindexdot"

changeset 437	5b38a5af4019
parent 429	688d03d6997a
child 443	470a83212dda