[PATCH 5 of 5] interactive: make revert -i and shelve -i not experimental

Laurent Charignon lcharignon at fb.com
Thu May 21 18:17:17 CDT 2015


# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1432245450 25200
#      Thu May 21 14:57:30 2015 -0700
# Node ID ed52edede2218b00d810097e999a1dead2a6d616
# Parent  8f8a971dcca865d75dbfa29f084b4438207d33ba
interactive: make revert -i and shelve -i not experimental

This patch makes revert -i and shelve -i not experimental anymore, because:
- shelve -i uses the same code path as commit -i that is not experimental
- revert -i does not have the known issue with edition of newly added files

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -672,8 +672,7 @@
           ('p', 'patch', None,
            _('show patch')),
           ('i', 'interactive', None,
-           _('interactive mode, only works while creating a shelve'
-                   '(EXPERIMENTAL)')),
+           _('interactive mode, only works while creating a shelve')),
           ('', 'stat', None,
            _('output diffstat-style summary of changes'))] + commands.walkopts,
          _('hg shelve [OPTION]... [FILE]...'))
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5468,7 +5468,7 @@
     ('r', 'rev', '', _('revert to the specified revision'), _('REV')),
     ('C', 'no-backup', None, _('do not save backup copies of files')),
     ('i', 'interactive', None,
-            _('interactively select the changes (EXPERIMENTAL)')),
+            _('interactively select the changes')),
     ] + walkopts + dryrunopts,
     _('[OPTION]... [-r REV] [NAME]...'))
 def revert(ui, repo, *pats, **opts):
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -60,6 +60,7 @@
    -m --message TEXT        use text as shelve message
    -n --name NAME           use the given name for the shelved commit
    -p --patch               show patch
+   -i --interactive         interactive mode, only works while creating a shelve
       --stat                output diffstat-style summary of changes
    -I --include PATTERN [+] include names matching the given patterns
    -X --exclude PATTERN [+] exclude names matching the given patterns


More information about the Mercurial-devel mailing list