# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1418523552 28800
# Node ID cc3e681201858c05bddf40cc23dd3cee1b745d09
# Parent  bc601c010185ace6e64db6c4a72a75b1d321c623
evolve: remove the dependency to the rebase extension

We do not use any rebase internal anymore.

diff -r bc601c010185 -r cc3e68120185 README
--- a/README	Sat Dec 13 18:09:23 2014 -0800
+++ b/README	Sat Dec 13 18:19:12 2014 -0800
@@ -51,6 +51,10 @@
 Changelog
 =========
 
+5.0.2 --
+
+- evolve: remove dependency to the rebase extension
+
 5.0.1 -- 2014-11-25
 
 - amend: fix --logfile argument
diff -r bc601c010185 -r cc3e68120185 hgext/evolve.py
--- a/hgext/evolve.py	Sat Dec 13 18:09:23 2014 -0800
+++ b/hgext/evolve.py	Sat Dec 13 18:19:12 2014 -0800
@@ -768,8 +768,6 @@
                                 "manually with nothing to rebase - working "
                                 "directory parent is also destination"))
 
-    rebase = extensions.find('rebase')
-    # dummy state to trick rebase node
     if not orig.p2().rev() == node.nullrev:
         raise util.Abort(
             'no support for evolving merge changesets yet',
@@ -2253,11 +2251,6 @@
 
 @eh.extsetup
 def oldevolveextsetup(ui):
-    try:
-        rebase = extensions.find('rebase')
-    except KeyError:
-        raise error.Abort(_('evolution extension requires rebase extension.'))
-
     for cmd in ['kill', 'uncommit', 'touch', 'fold']:
         entry = extensions.wrapcommand(cmdtable, cmd,
                                        warnobserrors)
diff -r bc601c010185 -r cc3e68120185 tests/_exc-util.sh
--- a/tests/_exc-util.sh	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/_exc-util.sh	Sat Dec 13 18:19:12 2014 -0800
@@ -20,7 +20,6 @@
 
 [extensions]
 hgext.strip=
-hgext.rebase=
 EOF
 echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
diff -r bc601c010185 -r cc3e68120185 tests/test-amend.t
--- a/tests/test-amend.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-amend.t	Sat Dec 13 18:19:12 2014 -0800
@@ -1,6 +1,5 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-corrupt.t
--- a/tests/test-corrupt.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-corrupt.t	Sat Dec 13 18:19:12 2014 -0800
@@ -13,7 +13,6 @@
   > git = 1
   > unified = 0
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-drop.t
--- a/tests/test-drop.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-drop.t	Sat Dec 13 18:19:12 2014 -0800
@@ -1,7 +1,6 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext/drophack.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-evolve-bumped.t
--- a/tests/test-evolve-bumped.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-evolve-bumped.t	Sat Dec 13 18:19:12 2014 -0800
@@ -10,7 +10,6 @@
   $ cd private
   $ cat >> .hg/hgrc <<EOF
   > [extensions]
-  > rebase =
   > evolve = $evolvepath
   > [phases]
   > publish = false
diff -r bc601c010185 -r cc3e68120185 tests/test-evolve.t
--- a/tests/test-evolve.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-evolve.t	Sat Dec 13 18:19:12 2014 -0800
@@ -13,7 +13,6 @@
   > git = 1
   > unified = 0
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-import.t
--- a/tests/test-import.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-import.t	Sat Dec 13 18:19:12 2014 -0800
@@ -9,7 +9,6 @@
   $ hg init auto-obsolete
   $ cd auto-obsolete
   $ echo '[extensions]' >> $HGRCPATH
-  $ echo 'rebase=' >> $HGRCPATH
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
   $ echo A > a
   $ hg commit -Am A
diff -r bc601c010185 -r cc3e68120185 tests/test-obsolete-push.t
--- a/tests/test-obsolete-push.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-obsolete-push.t	Sat Dec 13 18:19:12 2014 -0800
@@ -2,7 +2,6 @@
   > [defaults]
   > amend=-d "0 0"
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-prev-next.t
--- a/tests/test-prev-next.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-prev-next.t	Sat Dec 13 18:19:12 2014 -0800
@@ -1,6 +1,5 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-prune.t
--- a/tests/test-prune.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-prune.t	Sat Dec 13 18:19:12 2014 -0800
@@ -2,7 +2,6 @@
   > [ui]
   > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n
   > [extensions]
-  > hgext.rebase=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
diff -r bc601c010185 -r cc3e68120185 tests/test-simple4server-bundle2.t
--- a/tests/test-simple4server-bundle2.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-simple4server-bundle2.t	Sat Dec 13 18:19:12 2014 -0800
@@ -7,8 +7,6 @@
   > allow_push = *
   > [phases]
   > publish = False
-  > [extensions]
-  > hgext.rebase=
   > [experimental]
   > bundle2-exp=True
   > EOF
diff -r bc601c010185 -r cc3e68120185 tests/test-simple4server.t
--- a/tests/test-simple4server.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-simple4server.t	Sat Dec 13 18:19:12 2014 -0800
@@ -8,7 +8,6 @@
   > [phases]
   > publish = False
   > [extensions]
-  > hgext.rebase=
   > EOF
 
   $ mkcommit() {
diff -r bc601c010185 -r cc3e68120185 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-stabilize-conflict.t	Sat Dec 13 18:19:12 2014 -0800
@@ -16,7 +16,6 @@
   > touch.gui=true
   > touch.args=babar
   > [extensions]
-  > hgext.rebase=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 
diff -r bc601c010185 -r cc3e68120185 tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-stabilize-order.t	Sat Dec 13 18:19:12 2014 -0800
@@ -2,7 +2,6 @@
   > [defaults]
   > amend=-d "0 0"
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-uncommit.t
--- a/tests/test-uncommit.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-uncommit.t	Sat Dec 13 18:19:12 2014 -0800
@@ -1,6 +1,5 @@
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
-  > hgext.rebase=
   > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
diff -r bc601c010185 -r cc3e68120185 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Sat Dec 13 18:09:23 2014 -0800
+++ b/tests/test-wireproto.t	Sat Dec 13 18:19:12 2014 -0800
@@ -7,7 +7,6 @@
   > [phases]
   > publish = False
   > [extensions]
-  > hgext.rebase=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH