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

equal deleted inserted replaced

-:a82eae840447
+:c2e77581bc84
 ui.status("summary:     %s\n" % description.splitlines()[0])
 ui.status("\n")
 def show_version(ui):
 """output version and copyright information"""
-ui.write("Mercurial version %s\n" % version.get_version())
+ui.write("Mercurial Distributed SCM (version %s)\n"
+% version.get_version())
 ui.status(
 "\nCopyright (C) 2005 Matt Mackall <mpm@selenic.com>\n"
 "This is free software; see the source for copying conditions. "
 "There is NO\nwarranty; "
 "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 )
 def help_(ui, cmd=None):
 """show help for a given command or all commands"""
-if cmd:
+if cmd and cmd != 'shortlist':
-try:
+key, i = find(cmd)
-i = find(cmd)
+# synopsis
 ui.write("%s\n\n" % i[2])
-if i[1]:
+# description
-for s, l, d, c in i[1]:
+doc = i[0].__doc__
-opt = ' '
+if ui.quiet:
-if s:
+doc = doc.splitlines(0)[0]
-opt = opt + '-' + s + ' '
+ui.write("%s\n" % doc.rstrip())
-if l:
-opt = opt + '--' + l + ' '
+# aliases
-if d:
+if not ui.quiet:
-opt = opt + '(' + str(d) + ')'
+aliases = ', '.join(key.split('|')[1:])
-ui.write(opt, "\n")
+if aliases:
-if c:
+ui.write("\naliases: %s\n" % aliases)
-ui.write('   %s\n' % c)
-ui.write("\n")
+# options
+if not ui.quiet and i[1]:
-ui.write(i[0].__doc__, "\n")
+ui.write("\noptions:\n\n")
-except UnknownCommand:
+for s, l, d, c in i[1]:
-ui.warn("hg: unknown command %s\n" % cmd)
+opt = ' '
-sys.exit(0)
+if s:
+opt = opt + '-' + s + ' '
+if l:
+opt = opt + '--' + l + ' '
+if d:
+opt = opt + '(' + str(d) + ')'
+ui.write(opt, "\n")
+if c:
+ui.write('   %s\n' % c)
 else:
+# program name
 if ui.verbose:
 show_version(ui)
-ui.write('\n')
-if ui.verbose:
-ui.write('hg commands:\n\n')
 else:
-ui.write('basic hg commands (use "hg help -v" for more):\n\n')
+ui.status("Mercurial Distributed SCM\n")
+ui.status('\n')
+# list of commands
+if cmd == "shortlist":
+ui.status('basic commands (use "hg help" '
+'for the full list or option "-v" for details):\n\n')
+elif ui.verbose:
+ui.status('list of commands:\n\n')
+else:
+ui.status('list of commands (use "hg help -v" '
+'to show aliases and global options):\n\n')
 h = {}
+cmds = {}
 for c, e in table.items():
 f = c.split("|")[0]
-if not ui.verbose and not f.startswith("^"):
+if cmd == "shortlist" and not f.startswith("^"):
 continue
+f = f.lstrip("^")
 if not ui.debugflag and f.startswith("debug"):
 continue
-f = f.lstrip("^")
 d = ""
 if e[0].__doc__:
 d = e[0].__doc__.splitlines(0)[0].rstrip()
 h[f] = d
+cmds[f]=c.lstrip("^")
 fns = h.keys()
 fns.sort()
 m = max(map(len, fns))
 for f in fns:
-ui.write(' %-*s   %s\n' % (m, f, h[f]))
+if ui.verbose:
+commands = cmds[f].replace("|",", ")
+ui.write(" %s:\n      %s\n"%(commands,h[f]))
+else:
+ui.write(' %-*s   %s\n' % (m, f, h[f]))
+# global options
+if ui.verbose:
+ui.write("\nglobal options:\n\n")
+for s, l, d, c in globalopts:
+opt = ' '
+if s:
+opt = opt + '-' + s + ' '
+if l:
+opt = opt + '--' + l + ' '
+if d:
+opt = opt + '(' + str(d) + ')'
+ui.write(opt, "\n")
+if c:
+ui.write('    %s\n' % c)
 # Commands start here, listed alphabetically
 def add(ui, repo, *pats, **opts):
 '''add the specified files on the next commit'''
 elif not line.startswith("# ") and line:
 message.append(line)
 hgpatch = False
 elif line == '# HG changeset patch':
 hgpatch = True
+message = []       # We may have collected garbage
 else:
 message.append(line)
 # make sure message isn't empty
 if not message:
 '''show changed files in the working directory
 M = modified
 A = added
 R = removed
-? = not tracked'''
+? = not tracked
+'''
 cwd = repo.getcwd()
 files, matchfn = matchpats(repo, cwd, pats, opts)
 (c, a, d, u) = [[pathto(cwd, x) for x in n]
 for n in repo.changes(files=files, match=matchfn)]
-for f in c:
+changetypes = [('modified', 'M', c),
-ui.write("M ", f, "\n")
+('added', 'A', a),
-for f in a:
+('removed', 'R', d),
-ui.write("A ", f, "\n")
+('unknown', '?', u)]
-for f in d:
-ui.write("R ", f, "\n")
+for opt, char, changes in ([ct for ct in changetypes if opts[ct[0]]]
-for f in u:
+or changetypes):
-ui.write("? ", f, "\n")
+for f in changes:
+ui.write("%s %s\n" % (char, f))
 def tag(ui, repo, name, rev=None, **opts):
 """add a tag for the current tip or a given revision"""
 if opts['text']:
 ui.warn("Warning: -t and --text is deprecated,"
 return repo.verify()
 # Command options and aliases are listed here, alphabetically
 table = {
-"^add": (add,
+"^add":
-[('I', 'include', [], 'include path in search'),
+(add,
-('X', 'exclude', [], 'exclude path from search')],
+[('I', 'include', [], 'include path in search'),
-"hg add [FILE]..."),
+('X', 'exclude', [], 'exclude path from search')],
-"addremove": (addremove,
+"hg add [FILE]..."),
-[('I', 'include', [], 'include path in search'),
+"addremove":
-('X', 'exclude', [], 'exclude path from search')],
+(addremove,
-"hg addremove [OPTION]... [FILE]..."),
+[('I', 'include', [], 'include path in search'),
+('X', 'exclude', [], 'exclude path from search')],
+"hg addremove [OPTION]... [FILE]..."),
 "^annotate":
 (annotate,
 [('r', 'rev', '', 'revision'),
 ('u', 'user', None, 'show user'),
 ('n', 'number', None, 'show revision number'),
 "copy": (copy, [], 'hg copy SOURCE DEST'),
 "debugcheckstate": (debugcheckstate, [], 'debugcheckstate'),
 "debugstate": (debugstate, [], 'debugstate'),
 "debugindex": (debugindex, [], 'debugindex FILE'),
 "debugindexdot": (debugindexdot, [], 'debugindexdot FILE'),
-"debugwalk": (debugwalk,
+"debugwalk":
-[('I', 'include', [], 'include path in search'),
+(debugwalk,
-('X', 'exclude', [], 'exclude path from search')],
+[('I', 'include', [], 'include path in search'),
-'debugwalk [OPTIONS]... [FILE]...'),
+('X', 'exclude', [], 'exclude path from search')],
+'debugwalk [OPTIONS]... [FILE]...'),
 "^diff":
 (diff,
 [('r', 'rev', [], 'revision'),
 ('I', 'include', [], 'include path in search'),
 ('X', 'exclude', [], 'exclude path from search')],
 'hg diff [-r REV1 [-r REV2]] [FILE]...'),
 "^export":
 (export,
 [('o', 'output', "", 'output to file')],
 "hg export [-o OUTFILE] REV..."),
-"forget": (forget,
+"forget":
-[('I', 'include', [], 'include path in search'),
+(forget,
-('X', 'exclude', [], 'exclude path from search')],
+[('I', 'include', [], 'include path in search'),
-"hg forget FILE..."),
+('X', 'exclude', [], 'exclude path from search')],
+"hg forget FILE..."),
 "heads": (heads, [], 'hg heads'),
 "help": (help_, [], 'hg help [COMMAND]'),
 "identify|id": (identify, [], 'hg identify'),
 "import|patch":
 (import_,
 ('n', 'name', os.getcwd(), 'repository name'),
 ('', 'stdio', None, 'for remote clients'),
 ('t', 'templates', "", 'template map'),
 ('6', 'ipv6', None, 'use IPv6 in addition to IPv4')],
 "hg serve [OPTION]..."),
-"^status": (status,
+"^status":
-[('I', 'include', [], 'include path in search'),
+(status,
-('X', 'exclude', [], 'exclude path from search')],
+[('m', 'modified', None, 'show only modified files'),
-'hg status [FILE]...'),
+('a', 'added', None, 'show only added files'),
+('r', 'removed', None, 'show only removed files'),
+('u', 'unknown', None, 'show only unknown (not tracked) files'),
+('I', 'include', [], 'include path in search'),
+('X', 'exclude', [], 'exclude path from search')],
+"hg status [FILE]..."),
 "tag":
 (tag,
 [('l', 'local', None, 'make the tag local'),
 ('m', 'message', "", 'commit message'),
 ('t', 'text', "", 'commit message (deprecated: use -m)'),
 'hg update [-m] [-C] [REV]'),
 "verify": (verify, [], 'hg verify'),
 "version": (show_version, [], 'hg version'),
 }
-globalopts = [('v', 'verbose', None, 'verbose'),
+globalopts = [('v', 'verbose', None, 'verbose mode'),
-('', 'debug', None, 'debug'),
+('', 'debug', None, 'debug mode'),
-('q', 'quiet', None, 'quiet'),
+('q', 'quiet', None, 'quiet mode'),
 ('', 'profile', None, 'profile'),
 ('R', 'repository', "", 'repository root directory'),
 ('', 'traceback', None, 'print traceback on exception'),
 ('y', 'noninteractive', None, 'run non-interactively'),
 ('', 'version', None, 'output version information and exit'),
 norepo = "clone init version help debugindex debugindexdot"
 def find(cmd):
 for e in table.keys():
 if re.match("(%s)$" % e, cmd):
-return table[e]
+return e, table[e]
 raise UnknownCommand(cmd)
 class SignalInterrupt(Exception):
 """Exception raised on SIGTERM and SIGHUP."""
 raise ParseError(None, inst)
 if options["version"]:
 return ("version", show_version, [], options, cmdoptions)
 elif not args:
-return ("help", help_, [], options, cmdoptions)
+return ("help", help_, ["shortlist"], options, cmdoptions)
 else:
 cmd, args = args[0], args[1:]
-i = find(cmd)
+i = find(cmd)[1]
 # combine global options into local
 c = list(i[1])
 for o in globalopts:
 c.append((o[0], o[1], options[o[1]], o[3]))
 if inst.args[0]:
 u.warn("hg %s: %s\n" % (inst.args[0], inst.args[1]))
 help_(u, inst.args[0])
 else:
 u.warn("hg: %s\n" % inst.args[1])
-help_(u)
+help_(u, 'shortlist')
 sys.exit(-1)
 except UnknownCommand, inst:
 u = ui.ui()
 u.warn("hg: unknown command '%s'\n" % inst.args[0])
-help_(u)
+help_(u, 'shortlist')
 sys.exit(1)
 if options["time"]:
 def get_times():
 t = os.times()
 if len(tb) > 2: # no
 raise
 u.debug(inst, "\n")
 u.warn("%s: invalid arguments\n" % cmd)
 help_(u, cmd)
+except UnknownCommand, inst:
+u.warn("hg: unknown command '%s'\n" % inst.args[0])
+help_(u, 'shortlist')
 sys.exit(-1)

changeset 871	c2e77581bc84
parent 870	a82eae840447
parent 852	1df0983eb589
child 874	d4cb383e7de7
child 878	781266a78fe1
child 879	953ccddd57bd
child 882	bc9ca4d51d23