Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 29283:14eee72c8d52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 ead25aa27a43
children d48fc6f318a3
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Tue Apr 05 01:35:58 2016 +0000
+++ b/mercurial/cmdutil.py	Fri Jun 03 15:55:07 2016 +0200
@@ -3301,10 +3301,12 @@
         else:
             diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts)
         originalchunks = patch.parsepatch(diff)
+        operation = _('discard') if node == parent else _('revert')
 
         try:
 
-            chunks, opts = recordfilter(repo.ui, originalchunks)
+            chunks, opts = recordfilter(repo.ui, originalchunks,
+                                        operation=operation)
             if reversehunks:
                 chunks = patch.reversehunks(chunks)