Comments
Patch
@@ -190,11 +190,11 @@ def _createmarkers(orig, repo, relations
finally:
lockmod.release(tr, lock)
-def _computeobsoletenotrebasedwrap(orig, repo, rebasesetrevs, dest):
+def _filterobsoleterevswrap(orig, repo, rebasesetrevs, *args, **kwargs):
repo._notinhibited = rebasesetrevs
try:
repo.invalidatevolatilesets()
- r = orig(repo, rebasesetrevs, dest)
+ r = orig(repo, rebasesetrevs, *args, **kwargs)
finally:
del repo._notinhibited
repo.invalidatevolatilesets()
@@ -258,9 +258,10 @@ def extsetup(ui):
try:
rebase = extensions.find('rebase')
if rebase:
- extensions.wrapfunction(rebase,
- '_computeobsoletenotrebased',
- _computeobsoletenotrebasedwrap)
+ if util.safehasattr(rebase, '_filterobsoleterevs'):
+ extensions.wrapfunction(rebase,
+ '_filterobsoleterevs',
+ _filterobsoleterevswrap)
except KeyError:
pass
# There are two ways to save bookmark changes during a transation, we