changeset 5973:8a7ad6ba2654

evolve: drop the deprecated --unstable, --divergent and --bumped flags

--- a/CHANGELOG	Wed Feb 03 13:23:41 2021 +0530
+++ b/CHANGELOG	Sat Jun 19 22:13:13 2021 +0300
@@ -7,6 +7,9 @@
   * next: add an --abort flag
   * evolve: use a more stable criteria for picking p1 when solving
             content-divergence (most recent evolution will be used).
+  * evolve: drop the deprecated --unstable, --divergent and --bumped flags,
+    they were replaced by --orphan, --content-divergent and --phase-divergent
+    respectively a long time ago
 
 10.3.2 -- 2021-05-28
 --------------------

--- a/hgext3rd/evolve/evolvecmd.py	Wed Feb 03 13:23:41 2021 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sat Jun 19 22:13:13 2021 +0300
@@ -1475,28 +1475,6 @@
         if opts['all']:
             raise error.Abort(_(b'cannot specify both "--rev" and "--all"'))
 
-    # Backward compatibility
-    if opts['unstable']:
-        msg = (b"'evolve --unstable' is deprecated, "
-               b"use 'evolve --orphan'")
-        repo.ui.deprecwarn(msg, b'4.4')
-
-        opts['orphan'] = opts['unstable']
-
-    if opts['divergent']:
-        msg = (b"'evolve --divergent' is deprecated, "
-               b"use 'evolve --content-divergent'")
-        repo.ui.deprecwarn(msg, b'4.4')
-
-        opts['content_divergent'] = opts['divergent']
-
-    if opts['bumped']:
-        msg = (b"'evolve --bumped' is deprecated, "
-               b"use 'evolve --phase-divergent'")
-        repo.ui.deprecwarn(msg, b'4.4')
-
-        opts['phase_divergent'] = opts['bumped']
-
     return opts
 
 def _cleanup(ui, repo, startnode, shouldupdate, headnode):
@@ -1557,11 +1535,8 @@
       _(b'also consider troubled changesets unrelated to current working '
         b'directory')),
      (b'r', b'rev', [], _(b'solves troubles of these revisions'), _(b'REV')),
-     (b'', b'bumped', False, _(b'solves only bumped changesets (DEPRECATED)')),
      (b'', b'phase-divergent', False, _(b'solves only phase-divergent changesets')),
-     (b'', b'divergent', False, _(b'solves only divergent changesets (DEPRECATED)')),
      (b'', b'content-divergent', False, _(b'solves only content-divergent changesets')),
-     (b'', b'unstable', False, _(b'solves only unstable changesets (DEPRECATED)')),
      (b'', b'orphan', False, _(b'solves only orphan changesets (default)')),
      (b'a', b'all', None, _(b'evolve all troubled changesets related to the current'
                             b' working directory and its descendants (default)')),