Patchwork [3,of,3] revert: make the interactive mode experimental

login
register
mail settings
Submitter Laurent Charignon
Date April 27, 2015, 11:14 p.m.
Message ID <55b3a3a321bce6e5c0cd.1430176448@dev919.prn2.facebook.com>
Download mbox | patch
Permalink /patch/8803/
State Superseded
Headers show

Comments

Laurent Charignon - April 27, 2015, 11:14 p.m.
# HG changeset patch
# User Laurent Charignon <lcharignon@fb.com>
# Date 1430174277 25200
#      Mon Apr 27 15:37:57 2015 -0700
# Branch stable
# Node ID 55b3a3a321bce6e5c0cd109c4ec483f198f843a1
# Parent  4c3a7dd5664f750df6d433191cd62aa11799dff5
revert: make the interactive mode experimental

While fixing issue4304: "record: allow editing new files" we introduced
changes in record/crecord. These changes need to be matched with changes in any
command using record. Revert is one of these commands and the changes have
not been made for this release. Therefore, revert -i should be an experimental
feature for this release.
Gregory Szorc - April 27, 2015, 11:58 p.m.
On Mon, Apr 27, 2015 at 4:14 PM, Laurent Charignon <lcharignon@fb.com>
wrote:

> # HG changeset patch
> # User Laurent Charignon <lcharignon@fb.com>
> # Date 1430174277 25200
> #      Mon Apr 27 15:37:57 2015 -0700
> # Branch stable
> # Node ID 55b3a3a321bce6e5c0cd109c4ec483f198f843a1
> # Parent  4c3a7dd5664f750df6d433191cd62aa11799dff5
> revert: make the interactive mode experimental
>
> While fixing issue4304: "record: allow editing new files" we introduced
> changes in record/crecord. These changes need to be matched with changes
> in any
> command using record. Revert is one of these commands and the changes have
> not been made for this release. Therefore, revert -i should be an
> experimental
> feature for this release.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -5464,7 +5464,8 @@
>      ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
>      ('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')),
> +    ('i', 'interactive', None,\
> +            _('interactively select the changes (EXPERIMENTAL)')),
>
>
A line continuation isn't needed since you are inside ().

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5464,7 +5464,8 @@ 
     ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
     ('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')),
+    ('i', 'interactive', None,\
+            _('interactively select the changes (EXPERIMENTAL)')),
     ] + walkopts + dryrunopts,
     _('[OPTION]... [-r REV] [NAME]...'))
 def revert(ui, repo, *pats, **opts):