Mercurial > hg
diff mercurial/patch.py @ 29283:14eee72c8d52
revert: use "discard"/"revert" verb when reverting interactively (issue5143)
Instead of "record this change to 'FILE'?" now prompt with:
* "discard this change to 'FILE'?" when reverting to the parent of working
directory, and,
* "revert this change to 'FILE'?" otherwise.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Fri, 03 Jun 2016 15:55:07 +0200 |
parents | 9d38a2061fd8 |
children | d48fc6f318a3 |
line wrap: on
line diff
--- a/mercurial/patch.py Tue Apr 05 01:35:58 2016 +0000 +++ b/mercurial/patch.py Fri Jun 03 15:55:07 2016 +0200 @@ -1109,11 +1109,12 @@ if skipfile is None and skipall is None: chunk.pretty(ui) if total == 1: - msg = _("record this change to '%s'?") % chunk.filename() + msg = _("%s this change to '%s'?") % (operation, + chunk.filename()) else: idx = pos - len(h.hunks) + i - msg = _("record change %d/%d to '%s'?") % (idx, total, - chunk.filename()) + msg = _("%s change %d/%d to '%s'?") % (operation, idx, total, + chunk.filename()) r, skipfile, skipall, newpatches = prompt(skipfile, skipall, msg, chunk) if r: