--- a/hgext3rd/evolve/__init__.py	Fri Aug 11 10:52:44 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Fri Aug 11 11:23:37 2017 +0200
@@ -1016,7 +1016,7 @@
     hint = None
 
     troubled = {
-        "orphan": repo.revs("unstable()"),
+        "orphan": repo.revs("orphan()"),
         "contentdivergent": repo.revs("divergent()"),
         "phasedivergent": repo.revs("bumped()"),
         "all": repo.revs("troubled()"),
@@ -1618,7 +1618,7 @@
     one of its descendants. Empty list if none can be found."""
     target = set(revs)
     result = []
-    for r in repo.revs('unstable() - %ld', revs):
+    for r in repo.revs('orphan() - %ld', revs):
         dest = _possibledestination(repo, r)
         if target & dest:
             result.append(r)
@@ -1630,7 +1630,7 @@
     target = set(revs)
     result = set(target)
     paths = collections.defaultdict(set)
-    for r in repo.revs('unstable() - %ld', revs):
+    for r in repo.revs('orphan() - %ld', revs):
         for d in _possibledestination(repo, r):
             paths[d].add(r)
 

--- a/tests/test-evolve-order.t	Fri Aug 11 10:52:44 2017 +0200
+++ b/tests/test-evolve-order.t	Fri Aug 11 11:23:37 2017 +0200
@@ -102,7 +102,7 @@
   |/
   o  0:f92638be10c7@default(public) add p
   
-  $ hg evolve --rev "unstable()"
+  $ hg evolve --rev "orphan()"
   move:[11] bprime
   atop:[12] asecond
   move:[7] add _c
@@ -257,7 +257,7 @@
   2 files updated, 0 files merged, 3 files removed, 0 files unresolved
   $ hg amend -m 'b3second'
   1 new unstable changesets
-  $ hg evolve --rev 'unstable()'
+  $ hg evolve --rev "orphan()"
   move:[30] add b4_
   atop:[35] b3second
   skipping 0b9488394e89: divergent rewriting. can't choose destination

--- a/tests/test-obsolete.t	Fri Aug 11 10:52:44 2017 +0200
+++ b/tests/test-obsolete.t	Fri Aug 11 11:23:37 2017 +0200
@@ -145,7 +145,7 @@
   $ qlog -r 'suspended()'
   3
   - 0d3f46688ccc
-  $ qlog -r 'unstable()'
+  $ qlog -r "orphan()"
   5
   - a7a6f2b5d8a5
 

--- a/tests/test-stabilize-result.t	Fri Aug 11 10:52:44 2017 +0200
+++ b/tests/test-stabilize-result.t	Fri Aug 11 11:23:37 2017 +0200
@@ -86,7 +86,7 @@
   fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
-  $ hg revert -r 'unstable()' a
+  $ hg revert -r "orphan()" a
   $ hg diff
   diff -r 66719795a494 a
   --- a/a	* (glob)

--- a/tests/test-tutorial.t	Fri Aug 11 10:52:44 2017 +0200
+++ b/tests/test-tutorial.t	Fri Aug 11 11:23:37 2017 +0200
@@ -826,7 +826,7 @@
   |
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
-  $ hg log -r 'unstable()'
+  $ hg log -r "orphan()"
   99f039c5ec9e (draft): SPAM SPAM SPAM
 
   $ hg evolve

--- a/tests/test-userguide.t	Fri Aug 11 10:52:44 2017 +0200
+++ b/tests/test-userguide.t	Fri Aug 11 11:23:37 2017 +0200
@@ -168,7 +168,7 @@
   2 new unstable changesets
   $ hg shortlog -r 'obsolete()'
   11:3e1cb8f70c02  draft  fix bug 17
-  $ hg shortlog -r 'unstable()'
+  $ hg shortlog -r "orphan()"
   12:debd46bb29dc  draft  cleanup
   13:dadcbba2d606  draft  feature 23
   $ hg --hidden shortlog -G -r 10::