[PATCH 2 of 2] revert: change the direction of revert -i

Laurent Charignon lcharignon at fb.com
Wed Jun 24 11:12:38 CDT 2015


On Jun 23, 2015, at 6:00 PM, Pierre-Yves David <pierre-yves.david at ens-lyon.org<mailto:pierre-yves.david at ens-lyon.org>> wrote:



On 06/23/2015 02:38 PM, Laurent Charignon wrote:
# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com<mailto:lcharignon at fb.com>>
# Date 1435094895 25200
#      Tue Jun 23 14:28:15 2015 -0700
# Node ID dab02b9a09de974098b672d00c6ea4b74d7741f8
# Parent  595e7697c6fea4b359eecfd6fb611e267ca7bb58
revert: change the direction of revert -i

Pushed to the clowncopter, thanks.

I'm happy to see the topic moving forward.

After the discussion on the list, about hg revert -i, it seems like we are
satisfied with what we called proposition 2. It shows the changes to revert in
the same direction than hg diff. This patch makes it the default option.
It changes all the + in - and vice versa in the tests for revert -i.

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3102,7 +3102,7 @@ def _performrevert(repo, parents, ctx, a
         diffopts.git = True
         reversehunks =  repo.ui.configbool('experimental',
                                            'revertalternateinteractivemode',
-                                           False)
+                                           True)

The mode is not so much alternate anymore ;-)

But we can probably leave if like that for now. What would be your criteria to drop the commands ?

To drop what commands?
Do you mean dropping the alternate mode?
We can do it right away if we want to.

Thanks,

Laurent

--
Pierre-Yves David

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150624/25f2671d/attachment.html>


More information about the Mercurial-devel mailing list