Patchwork [1,of,2,evolve-ext] evolvecmd: mark flags with old instability names as deprecated

login
register
mail settings
Submitter Anton Shestakov
Date Oct. 14, 2018, 11:42 a.m.
Message ID <f3d9033c08be3b97861f.1539517327@s20>
Download mbox | patch
Permalink /patch/35984/
State New
Headers show

Comments

Anton Shestakov - Oct. 14, 2018, 11:42 a.m.
# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1539516913 -7200
#      Sun Oct 14 13:35:13 2018 +0200
# Node ID f3d9033c08be3b97861f490a62619887def287f8
# Parent  3c28f8a3a5a5773952ea58e9098c8d1ff4234002
evolvecmd: mark flags with old instability names as deprecated
Boris Feld - Oct. 19, 2018, 4:05 p.m.
I was checking the in-flight patches and saw that we never acknowledge
the reception of those patches.

Thank you, they have been merged in evolve.

Sorry about the delay.

On 14/10/2018 13:42, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6@dwimlabs.net>
> # Date 1539516913 -7200
> #      Sun Oct 14 13:35:13 2018 +0200
> # Node ID f3d9033c08be3b97861f490a62619887def287f8
> # Parent  3c28f8a3a5a5773952ea58e9098c8d1ff4234002
> evolvecmd: mark flags with old instability names as deprecated
>
> diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
> --- a/hgext3rd/evolve/evolvecmd.py
> +++ b/hgext3rd/evolve/evolvecmd.py
> @@ -1341,11 +1341,11 @@ def divergentsets(repo, ctx):
>        _('also consider troubled changesets unrelated to current working '
>          'directory')),
>       ('r', 'rev', [], _('solves troubles of these revisions')),
> -     ('', 'bumped', False, _('solves only bumped changesets')),
> +     ('', 'bumped', False, _('solves only bumped changesets (DEPRECATED)')),
>       ('', 'phase-divergent', False, _('solves only phase-divergent changesets')),
> -     ('', 'divergent', False, _('solves only divergent changesets')),
> +     ('', 'divergent', False, _('solves only divergent changesets (DEPRECATED)')),
>       ('', 'content-divergent', False, _('solves only content-divergent changesets')),
> -     ('', 'unstable', False, _('solves only unstable changesets')),
> +     ('', 'unstable', False, _('solves only unstable changesets (DEPRECATED)')),
>       ('', 'orphan', False, _('solves only orphan changesets (default)')),
>       ('a', 'all', False, _('evolve all troubled changesets related to the '
>                             'current  working directory and its descendants')),
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext3rd/evolve/evolvecmd.py b/hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py
+++ b/hgext3rd/evolve/evolvecmd.py
@@ -1341,11 +1341,11 @@  def divergentsets(repo, ctx):
       _('also consider troubled changesets unrelated to current working '
         'directory')),
      ('r', 'rev', [], _('solves troubles of these revisions')),
-     ('', 'bumped', False, _('solves only bumped changesets')),
+     ('', 'bumped', False, _('solves only bumped changesets (DEPRECATED)')),
      ('', 'phase-divergent', False, _('solves only phase-divergent changesets')),
-     ('', 'divergent', False, _('solves only divergent changesets')),
+     ('', 'divergent', False, _('solves only divergent changesets (DEPRECATED)')),
      ('', 'content-divergent', False, _('solves only content-divergent changesets')),
-     ('', 'unstable', False, _('solves only unstable changesets')),
+     ('', 'unstable', False, _('solves only unstable changesets (DEPRECATED)')),
      ('', 'orphan', False, _('solves only orphan changesets (default)')),
      ('a', 'all', False, _('evolve all troubled changesets related to the '
                            'current  working directory and its descendants')),