changeset 2949:9345b2eeeef3

amend: lift the --interactive constraint on `--extract` The uncommit logic now supports interactive selection.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 19 Sep 2017 12:52:22 +0200
parents 9e610e882808
children 1b4c92621e23
files hgext3rd/evolve/cmdrewrite.py tests/test-uncommit-interactive.t
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/cmdrewrite.py	Mon Sep 18 04:31:59 2017 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Tue Sep 19 12:52:22 2017 +0200
@@ -100,9 +100,6 @@
     """
     opts = opts.copy()
     if opts.get('extract'):
-        if opts.pop('interactive', False):
-            msg = _('not support for --interactive with --extract yet')
-            raise error.Abort(msg)
         return uncommit(ui, repo, *pats, **opts)
     else:
         if opts.pop('all', False):
--- a/tests/test-uncommit-interactive.t	Mon Sep 18 04:31:59 2017 +0200
+++ b/tests/test-uncommit-interactive.t	Tue Sep 19 12:52:22 2017 +0200
@@ -128,7 +128,7 @@
 Uncommit a chunk
 ================
 
-  $ hg uncommit -i<<EOF
+  $ hg amend --extract -i<<EOF
   > y
   > y
   > n