Mercurial > public > mercurial-scm > evolve

diff hgext/evolve.py @ 1185:cc3e68120185 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove the dependency to the rebase extension We do not use any rebase internal anymore.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 13 Dec 2014 18:19:12 -0800
parents bc601c010185
children 253293df84a6 dbd0733e5840
line wrap: on
line diff
--- 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)