--- a/hgext/rebase.py Sun May 24 16:38:29 2009 -0500
+++ b/hgext/rebase.py Sun May 24 22:37:20 2009 +0200
@@ -96,7 +96,7 @@
if result:
originalwd, target, state, external = result
else: # Empty state built, nothing to rebase
- repo.ui.status(_('nothing to rebase\n'))
+ ui.status(_('nothing to rebase\n'))
return
if keepbranchesf:
@@ -133,7 +133,7 @@
ui.warn(_("warning: new changesets detected on source branch, "
"not stripping\n"))
else:
- repair.strip(repo.ui, repo, repo[min(state)].node(), "strip")
+ repair.strip(ui, repo, repo[min(state)].node(), "strip")
clearstatus(repo)
ui.status(_("rebase completed\n"))