Mercurial > hg-stable

diff hgext/rebase.py @ 14289:d68ddccf276b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: bail_if_changed to bailifchanged
author Matt Mackall <mpm@selenic.com>
date Tue, 10 May 2011 16:08:46 -0500
parents e4ffb9576b63
children db2a8eabe952
line wrap: on
line diff
--- a/hgext/rebase.py	Sun May 08 23:27:48 2011 +0200
+++ b/hgext/rebase.py	Tue May 10 16:08:46 2011 -0500
@@ -132,7 +132,7 @@
                 if basef:
                     raise util.Abort(_('cannot specify a base with detach'))
 
-            cmdutil.bail_if_changed(repo)
+            cmdutil.bailifchanged(repo)
             result = buildstate(repo, destf, srcf, basef, detachf)
             if not result:
                 # Empty state built, nothing to rebase
@@ -531,7 +531,7 @@
             ui.debug('--update and --rebase are not compatible, ignoring '
                      'the update flag\n')
 
-        cmdutil.bail_if_changed(repo)
+        cmdutil.bailifchanged(repo)
         revsprepull = len(repo)
         origpostincoming = commands.postincoming
         def _dummy(*args, **kwargs):