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

comparison mercurial/commands.py @ 9656:2ae3758526d8

Merge with crew

author	Matt Mackall <mpm@selenic.com>
date	Tue, 27 Oct 2009 17:14:19 -0500
parents	6d7d3f849062 20b91f91f9ca
children	f3d60543924f

comparison

equal deleted inserted replaced

-:6d7d3f849062
+:2ae3758526d8
 format. For more information, read 'hg help diffs'.
 """
 revs = opts.get('rev')
 change = opts.get('change')
+stat = opts.get('stat')
 if revs and change:
 msg = _('cannot specify --rev and --change at the same time')
 raise util.Abort(msg)
 elif change:
 node2 = repo.lookup(change)
 node1 = repo[node2].parents()[0].node()
 else:
 node1, node2 = cmdutil.revpair(repo, revs)
+if stat:
+opts['unified'] = '0'
+diffopts = patch.diffopts(ui, opts)
 m = cmdutil.match(repo, pats, opts)
-it = patch.diff(repo, node1, node2, match=m, opts=patch.diffopts(ui, opts))
+it = patch.diff(repo, node1, node2, match=m, opts=diffopts)
-for chunk in it:
+if stat:
-ui.write(chunk)
+width = ui.interactive() and util.termwidth() or 80
+ui.write(patch.diffstat(util.iterlines(it), width=width,
+git=diffopts.git))
+else:
+for chunk in it:
+ui.write(chunk)
 def export(ui, repo, *changesets, **opts):
 """dump the header and diffs for one or more changesets
 Print the changeset header and diffs for one or more revisions.
 # list all option lists
 opt_output = []
 for title, options in option_lists:
 opt_output.append(("\n%s" % title, None))
 for shortopt, longopt, default, desc in options:
-if "DEPRECATED" in desc and not ui.verbose: continue
+if _("DEPRECATED") in desc and not ui.verbose: continue
 opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt,
 longopt and " --%s" % longopt),
 "%s%s" % (desc,
 default
 and _(" (default: %s)") % default
 ui.write("%s\n" % ' '.join(output))
 def import_(ui, repo, patch1, *patches, **opts):
 """import an ordered set of patches
-Import a list of patches and commit them individually.
+Import a list of patches and commit them individually (unless
+--no-commit is specified).
 If there are outstanding changes in the working directory, import
 will abort unless given the -f/--force flag.
 You can import a patch straight from a mail message. Even patches
 err = _("Other repository doesn't support revision lookup, "
 "so a rev cannot be specified.")
 raise util.Abort(err)
 modheads = repo.pull(other, heads=revs, force=opts.get('force'))
+if checkout:
+checkout = str(repo.changelog.rev(other.lookup(checkout)))
 return postincoming(ui, repo, modheads, opts.get('update'), checkout)
 def push(ui, repo, dest=None, **opts):
 """push changes to the specified destination
 wlock.release()
 def resolve(ui, repo, *pats, **opts):
 """retry file merges from a merge or update
-This command will cleanly retry unresolved file merges using file
+This command can cleanly retry unresolved file merges using file
 revisions preserved from the last update or merge. To attempt to
 resolve all unresolved files, use the -a/--all switch.
 If a conflict is resolved manually, please note that the changes
 will be overwritten if the merge is retried with resolve. The
 U = unresolved
 R = resolved
 """
-all, mark, unmark, show = [opts.get(o) for o in 'all mark unmark list'.split()]
+all, mark, unmark, show, nostatus = \
+[opts.get(o) for o in 'all mark unmark list no_status'.split()]
 if (show and (mark or unmark)) or (mark and unmark):
 raise util.Abort(_("too many options specified"))
 if pats and all:
 raise util.Abort(_("can't specify --all and patterns"))
 m = cmdutil.match(repo, pats, opts)
 for f in ms:
 if m(f):
 if show:
-ui.write("%s %s\n" % (ms[f].upper(), f))
+if nostatus:
+ui.write("%s\n" % f)
+else:
+ui.write("%s %s\n" % (ms[f].upper(), f))
 elif mark:
 ms.mark(f, "r")
 elif unmark:
 ms.mark(f, "u")
 else:
 _('ignore white space when comparing lines')),
 ('b', 'ignore-space-change', None,
 _('ignore changes in the amount of white space')),
 ('B', 'ignore-blank-lines', None,
 _('ignore changes whose lines are all blank')),
-('U', 'unified', '', _('number of lines of context to show'))
+('U', 'unified', '', _('number of lines of context to show')),
+('', 'stat', None, _('output diffstat-style summary of changes')),
 ]
 similarityopts = [
 ('s', 'similarity', '',
 _('guess renamed files by similarity (0<=s<=100)'))
 [('f', 'force', None,
 _('run even when remote repository is unrelated')),
 ('n', 'newest-first', None, _('show newest record first')),
 ('', 'bundle', '', _('file to store the bundles into')),
 ('r', 'rev', [],
-_('a specific revision up to which you would like to pull')),
+_('a specific remote revision up to which you would like to pull')),
 ] + logopts + remoteopts,
 _('[-p] [-n] [-M] [-f] [-r REV]...'
 ' [--bundle FILENAME] [SOURCE]')),
 "^init":
 (init,
 [('u', 'update', None,
 _('update to new tip if changesets were pulled')),
 ('f', 'force', None,
 _('run even when remote repository is unrelated')),
 ('r', 'rev', [],
-_('a specific revision up to which you would like to pull')),
+_('a specific remote revision up to which you would like to pull')),
 ] + remoteopts,
 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
 "^push":
 (push,
 [('f', 'force', None, _('force push')),
 "resolve":
 (resolve,
 [('a', 'all', None, _('remerge all unresolved files')),
 ('l', 'list', None, _('list state of files needing merge')),
 ('m', 'mark', None, _('mark files as resolved')),
-('u', 'unmark', None, _('unmark files as resolved'))]
+('u', 'unmark', None, _('unmark files as resolved')),
+('n', 'no-status', None, _('hide status prefix'))]
 + walkopts,
 _('[OPTION]... [FILE]...')),
 "revert":
 (revert,
 [('a', 'all', None, _('revert all changes when no arguments given')),

Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 9656:2ae3758526d8