# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1502446856 -7200
# Node ID a1805a65ce216a5134908b7cad44693b2fcd605d
# Parent  9c019996bce023af4c473f7ce6499fb7e425a137
revset: bumped volatile set was deprecated

Use phasedivergent volatile set instead.

Match 07a76d4f2297 mercurial changeset.

diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -490,7 +490,7 @@
     revset.getargs(x, 0, 0, 'troubled takes no arguments')
     troubled = set()
     troubled.update(getrevs(repo, 'orphan'))
-    troubled.update(getrevs(repo, 'bumped'))
+    troubled.update(getrevs(repo, 'phasedivergent'))
     troubled.update(getrevs(repo, 'contentdivergent'))
     troubled = revset.baseset(troubled)
     troubled.sort() # set is non-ordered, enforce order
@@ -760,14 +760,14 @@
     # This needs a better implementation but will probably wait for core.
     filtered = repo.changelog.filteredrevs
     priorunstables = len(set(getrevs(repo, 'orphan')) - filtered)
-    priorbumpeds = len(set(getrevs(repo, 'bumped')) - filtered)
+    priorbumpeds = len(set(getrevs(repo, 'phasedivergent')) - filtered)
     priordivergents = len(set(getrevs(repo, 'contentdivergent')) - filtered)
     ret = orig(ui, repo, *args, **kwargs)
     filtered = repo.changelog.filteredrevs
     newunstables = \
         len(set(getrevs(repo, 'orphan')) - filtered) - priorunstables
     newbumpeds = \
-        len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds
+        len(set(getrevs(repo, 'phasedivergent')) - filtered) - priorbumpeds
     newdivergents = \
         len(set(getrevs(repo, 'contentdivergent')) - filtered) - priordivergents
     if newunstables > 0:
diff --git a/hgext3rd/evolve/compat.py b/hgext3rd/evolve/compat.py
--- a/hgext3rd/evolve/compat.py
+++ b/hgext3rd/evolve/compat.py
@@ -158,3 +158,6 @@
 
 if not util.safehasattr(obsolete, '_computecontentdivergentset'):
     obsolete._computecontentdivergentset = obsolete.cachefor('contentdivergent')(obsolete._computedivergentset)
+
+if not util.safehasattr(obsolete, '_computephasedivergentset'):
+    obsolete._computephasedivergentset = obsolete.cachefor('phasedivergent')(obsolete._computebumpedset)
diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -159,6 +159,7 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg phase --public 7
+  1 new bumped changesets
   $ hg strip 9
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at cf5c4f4554ce