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

equal deleted inserted replaced

-:02f40b2ece3f
+:5b001f534452
 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:
 "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')),

changeset 9646	5b001f534452
parent 9645	02f40b2ece3f
child 9649	20b91f91f9ca