Kiln » Fog Creek
Clone URL:  

Rename bail_if_changed -> bailifchanged on Mercurial 1.9+.

Changeset 9837b9bcfef1…

Parent 6778e0358ddf…

by David Golub

Changes to one file · Browse files at 9837b9bcfef1 Showing diff from parent 6778e0358ddf Diff from another changeset...

Change 1 of 1 Show Entire File kbfiles/​bfsetup.py Stacked
 
874
875
876
877
 
 
 
 
 
 
878
879
880
 
874
875
876
 
877
878
879
880
881
882
883
884
885
@@ -874,7 +874,12 @@
  ui.debug('--update and --rebase are not compatible, ignoring '   'the update flag\n')   del opts['rebase'] - cmdutil.bail_if_changed(repo) + try: + # Mercurial >= 1.9 + cmdutil.bailifchanged(repo) + except AttributeError: + # Mercurial <= 1.8 + cmdutil.bail_if_changed(repo)   revsprepull = len(repo)   origpostincoming = commands.postincoming   def _dummy(*args, **kwargs):