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

equal deleted inserted replaced

-:a1b25fb2e764
+:fb4149eebdd4
 opt_output.append(("\n%s:\n" % title, None))
 for shortopt, longopt, default, desc in options:
 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
 longopt and " --%s" % longopt),
 "%s%s" % (desc,
-default and _(" (default: %s)") % default
+default
+and _(" (default: %s)") % default
 or "")))
 if opt_output:
 opts_len = max([len(line[0]) for line in opt_output if line[1]])
 for first, second in opt_output:
 else:
 revs = None
 if opts['rev']:
 if not other.local():
-raise util.Abort("clone -r not supported yet for remote repositories.")
+error = "clone -r not supported yet for remote repositories."
+raise util.Abort(error)
 else:
 revs = [other.lookup(rev) for rev in opts['rev']]
 repo = hg.repository(ui, dest, create=1)
 repo.pull(other, heads = revs)
 state = repo.dirstate.state(f)
 if state not in "nrm":
 ui.warn(_("%s in manifest1, but listed as state %s") % (f, state))
 errors += 1
 if errors:
-raise util.Abort(_(".hg/dirstate inconsistent with current parent's manifest"))
+error = _(".hg/dirstate inconsistent with current parent's manifest")
+raise util.Abort(error)
 def debugconfig(ui):
 """show combined config settings from all hgrc files"""
 try:
 repo = hg.repository(ui)
 raise util.Abort(_("export requires at least one changeset"))
 seqno = 0
 revs = list(revrange(ui, repo, changesets))
 total = len(revs)
 revwidth = max(map(len, revs))
-ui.note(len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n"))
+msg = len(revs) > 1 and _("Exporting patches:\n") or _("Exporting patch:\n")
+ui.note(msg)
 for cset in revs:
 seqno += 1
 doexport(ui, repo, cset, seqno, total, revwidth, opts)
 def forget(ui, repo, *pats, **opts):
 "^clone":
 (clone,
 [('U', 'noupdate', None, _('do not update the new working directory')),
 ('e', 'ssh', "", _('specify ssh command to use')),
 ('', 'pull', None, _('use pull protocol to copy metadata')),
-('r', 'rev', [], _('a changeset you would like to have after cloning')),
+('r', 'rev', [],
-('', 'remotecmd', "", _('specify hg command to run on the remote side'))],
+_('a changeset you would like to have after cloning')),
+('', 'remotecmd', "",
+_('specify hg command to run on the remote side'))],
 _('hg clone [OPTION]... SOURCE [DEST]')),
 "^commit|ci":
 (commit,
 [('A', 'addremove', None, _('run addremove during commit')),
 ('I', 'include', [], _('include names matching the given patterns')),
 ('l', 'logfile', "", _('read the commit message from <file>')),
 ('d', 'date', "", _('record datecode as commit date')),
 ('u', 'user', "", _('record user as commiter'))],
 _('hg commit [OPTION]... [FILE]...')),
 "copy|cp": (copy,
-[('I', 'include', [], _('include names matching the given patterns')),
+[('I', 'include', [],
-('X', 'exclude', [], _('exclude names matching the given patterns')),
+_('include names matching the given patterns')),
-('A', 'after', None, _('record a copy that has already occurred')),
+('X', 'exclude', [],
-('f', 'force', None, _('forcibly copy over an existing managed file'))],
+_('exclude names matching the given patterns')),
+('A', 'after', None,
+_('record a copy that has already occurred')),
+('f', 'force', None,
+_('forcibly copy over an existing managed file'))],
 _('hg copy [OPTION]... [SOURCE]... DEST')),
 "debugancestor": (debugancestor, [], _('debugancestor INDEX REV1 REV2')),
 "debugcheckstate": (debugcheckstate, [], _('debugcheckstate')),
 "debugconfig": (debugconfig, [], _('debugconfig')),
 "debugsetparents": (debugsetparents, [], _('debugsetparents REV1 [REV2]')),
 [('0', 'print0', None, _('end fields with NUL')),
 ('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns')),
 ('', 'all', None, _('print all revisions that match')),
 ('i', 'ignore-case', None, _('ignore case when matching')),
-('l', 'files-with-matches', None, _('print only filenames and revs that match')),
+('l', 'files-with-matches', None,
+_('print only filenames and revs that match')),
 ('n', 'line-number', None, _('print matching line numbers')),
 ('r', 'rev', [], _('search in given revision range')),
 ('u', 'user', None, _('print user who committed change'))],
 "hg grep [OPTION]... PATTERN [FILE]..."),
 "heads":
 _('hg heads [-b] [-r <rev>]')),
 "help": (help_, [], _('hg help [COMMAND]')),
 "identify|id": (identify, [], _('hg identify')),
 "import|patch":
 (import_,
-[('p', 'strip', 1, _('directory strip option for patch. This has the same\n') +
+[('p', 'strip', 1,
-_('meaning as the corresponding patch option')),
+_('directory strip option for patch. This has the same\n') +
-('f', 'force', None, _('skip check for outstanding uncommitted changes')),
+_('meaning as the corresponding patch option')),
+('f', 'force', None,
+_('skip check for outstanding uncommitted changes')),
 ('b', 'base', "", _('base path'))],
 "hg import [-f] [-p NUM] [-b BASE] PATCH..."),
 "incoming|in": (incoming,
 [('M', 'no-merges', None, _("do not show merges")),
 ('p', 'patch', None, _('show patch')),
 _('hg incoming [-p] [-n] [-M] [SOURCE]')),
 "^init": (init, [], _('hg init [DEST]')),
 "locate":
 (locate,
 [('r', 'rev', '', _('search the repository as it stood at rev')),
-('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+('0', 'print0', None,
-('f', 'fullpath', None, _('print complete paths from the filesystem root')),
+_('end filenames with NUL, for use with xargs')),
+('f', 'fullpath', None,
+_('print complete paths from the filesystem root')),
 ('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 _('hg locate [OPTION]... [PATTERN]...')),
 "^log|history":
 (log,
 _('hg outgoing [-p] [-n] [-M] [DEST]')),
 "^parents": (parents, [], _('hg parents [REV]')),
 "paths": (paths, [], _('hg paths [NAME]')),
 "^pull":
 (pull,
-[('u', 'update', None, _('update the working directory to tip after pull')),
+[('u', 'update', None,
+_('update the working directory to tip after pull')),
 ('e', 'ssh', "", _('specify ssh command to use')),
 ('r', 'rev', [], _('a specific revision you would like to pull')),
-('', 'remotecmd', "", _('specify hg command to run on the remote side'))],
+('', 'remotecmd', "",
+_('specify hg command to run on the remote side'))],
 _('hg pull [-u] [-e FILE] [-r rev] [--remotecmd FILE] [SOURCE]')),
 "^push":
 (push,
 [('f', 'force', None, _('force push')),
 ('e', 'ssh', "", _('specify ssh command to use')),
-('', 'remotecmd', "", _('specify hg command to run on the remote side'))],
+('', 'remotecmd', "",
+_('specify hg command to run on the remote side'))],
 _('hg push [-f] [-e FILE] [--remotecmd FILE] [DEST]')),
 "rawcommit":
 (rawcommit,
 [('p', 'parent', [], _('parent')),
 ('d', 'date', "", _('date code')),
 ('m', 'message', "", _('commit message')),
 ('l', 'logfile', "", _('commit message file'))],
 _('hg rawcommit [OPTION]... [FILE]...')),
 "recover": (recover, [], _("hg recover")),
 "^remove|rm": (remove,
-[('I', 'include', [], _('include names matching the given patterns')),
+[('I', 'include', [],
-('X', 'exclude', [], _('exclude names matching the given patterns'))],
+_('include names matching the given patterns')),
+('X', 'exclude', [],
+_('exclude names matching the given patterns'))],
 _("hg remove [OPTION]... FILE...")),
 "rename|mv": (rename,
-[('I', 'include', [], _('include names matching the given patterns')),
+[('I', 'include', [],
-('X', 'exclude', [], _('exclude names matching the given patterns')),
+_('include names matching the given patterns')),
-('A', 'after', None, _('record a rename that has already occurred')),
+('X', 'exclude', [],
-('f', 'force', None, _('forcibly copy over an existing managed file'))],
+_('exclude names matching the given patterns')),
+('A', 'after', None,
+_('record a rename that has already occurred')),
+('f', 'force', None,
+_('forcibly copy over an existing managed file'))],
 _('hg rename [OPTION]... [SOURCE]... DEST')),
 "^revert":
 (revert,
 [('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns')),
 (serve,
 [('A', 'accesslog', '', _('name of access log file to write to')),
 ('E', 'errorlog', '', _('name of error log file to write to')),
 ('p', 'port', 0, _('port to use (default: 8000)')),
 ('a', 'address', '', _('address to use')),
-('n', 'name', "", _('name to show in web pages (default: working dir)')),
+('n', 'name', "",
+_('name to show in web pages (default: working dir)')),
 ('', 'stdio', None, _('for remote clients')),
 ('t', 'templates', "", _('web templates to use')),
 ('', 'style', "", _('template style to use')),
 ('6', 'ipv6', None, _('use IPv6 in addition to IPv4'))],
 _("hg serve [OPTION]...")),
 [('m', 'modified', None, _('show only modified files')),
 ('a', 'added', None, _('show only added files')),
 ('r', 'removed', None, _('show only removed files')),
 ('u', 'unknown', None, _('show only unknown (not tracked) files')),
 ('n', 'no-status', None, _('hide status prefix')),
-('0', 'print0', None, _('end filenames with NUL, for use with xargs')),
+('0', 'print0', None,
+_('end filenames with NUL, for use with xargs')),
 ('I', 'include', [], _('include names matching the given patterns')),
 ('X', 'exclude', [], _('exclude names matching the given patterns'))],
 _("hg status [OPTION]... [FILE]...")),
 "tag":
 (tag,
 }
 globalopts = [
 ('R', 'repository', "", _("repository root directory")),
 ('', 'cwd', '', _("change working directory")),
-('y', 'noninteractive', None, _("do not prompt, assume 'yes' for any required answers")),
+('y', 'noninteractive', None,
+_("do not prompt, assume 'yes' for any required answers")),
 ('q', 'quiet', None, _("suppress output")),
 ('v', 'verbose', None, _("enable additional output")),
 ('', 'debug', None, _("enable debugging output")),
 ('', 'debugger', None, _("start debugger")),
 ('', 'traceback', None, _("print traceback on exception")),

changeset 1602	fb4149eebdd4
parent 1601	a1b25fb2e764
child 1607	d72d27ee72b9