Mercurial > public > mercurial-scm > hg

diff hgext/rebase.py @ 8615:94ca38e63576

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use ui instead of repo.ui when the former is in scope
author Martin Geisler <mg@lazybytes.net>
date Sun, 24 May 2009 22:37:20 +0200
parents 6d4bf1c1a003
children 3d44f1a68353
line wrap: on
line diff
--- 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"))