diff hgsubversion/wrappers.py @ 1040:ada2400241c4

fixes for running under Mercurial 2.0
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Mon, 05 Aug 2013 20:27:31 +0200
parents 3df6ed4e7561
children 67e11b650e94
line wrap: on
line diff
--- a/hgsubversion/wrappers.py
+++ b/hgsubversion/wrappers.py
@@ -303,7 +303,7 @@ def push(repo, dest, force, revs):
             util.swap_out_encoding()
 
         # strip the original changesets since the push was successful
-        repair.strip(ui, repo, outgoing, "all")
+        util.strip(ui, repo, outgoing, "all")
     finally:
         try:
             # It's always safe to delete the temporary commits.
@@ -315,8 +315,7 @@ def push(repo, dest, force, revs):
                 parent = repo[None].p1()
                 if parent.node() in temporary_commits:
                     hg.update(repo, parent.p1().node())
-                for n in temporary_commits:
-                    repair.strip(ui, repo, n, backup=None)
+                util.strip(ui, repo, temporary_commits, backup=None)
         finally:
             util.swap_out_encoding(old_encoding)
     return 1 # so we get a sane exit status, see hg's commands.push