Commits

Augie Fackler committed 72389b8

Handle cmdutil bail_if_changed rename.

  • Participants
  • Parent commits fb07da0

Comments (0)

Files changed (1)

File hg_histedit.py

     return repo[parent]
 _revsingle = getattr(cmdutil, 'revsingle', _revsingle)
 
+if getattr(cmdutil, 'bailifchanged', None):
+    from mercurial.cmdutil import bailifchanged
+else:
+    from mercurial.cmdutil import bail_if_changed as bailifchanged
+
 # Remove this hack and use cmdutil.updatedir when we're 1.7-only
 if getattr(cmdutil, 'updatedir', None):
     from mercurial.cmdutil import updatedir
         os.unlink(os.path.join(repo.path, 'histedit-state'))
         return
     else:
-        cmdutil.bail_if_changed(repo)
+        bailifchanged(repo)
         if os.path.exists(os.path.join(repo.path, 'histedit-state')):
             raise util.Abort('history edit already in progress, try '
                              '--continue or --abort')