--- a/hgext/evolve.py Wed Sep 19 17:30:07 2012 +0200
+++ b/hgext/evolve.py Wed Sep 19 15:28:35 2012 +0200
@@ -1115,11 +1115,14 @@
try:
rebase = extensions.find('rebase')
if rebase:
- extensions.wrapcommand(rebase.cmdtable, "rebase", cmdrebase)
- entry = extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
- extensions.wrapfunction(rebase, 'buildstate', buildstate)
- extensions.wrapfunction(rebase, 'defineparents', defineparents)
- extensions.wrapfunction(rebase, 'concludenode', concludenode)
+ incore = getattr(rebase, 'obsolete', None) is not None
+ if not incore:
+ extensions.wrapcommand(rebase.cmdtable, "rebase", cmdrebase)
+ extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
+ if not incore:
+ extensions.wrapfunction(rebase, 'buildstate', buildstate)
+ extensions.wrapfunction(rebase, 'defineparents', defineparents)
+ extensions.wrapfunction(rebase, 'concludenode', concludenode)
except KeyError:
pass # rebase not found