hgext/histedit.py
changeset 38512 39db5a01cd53
parent 38511 03e7ec8180f0
child 38549 7b57b1ed5c0f
--- a/hgext/histedit.py	Sat Jun 30 07:23:02 2018 +0530
+++ b/hgext/histedit.py	Sun Jul 01 21:40:55 2018 +0900
@@ -784,7 +784,7 @@
 
     def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
         parent = ctx.parents()[0].node()
-        hg.updaterepo(repo, parent, False)
+        hg.updaterepo(repo, parent, overwrite=False)
         ### prepare new commit data
         commitopts = {}
         commitopts['user'] = ctx.user()
@@ -815,7 +815,7 @@
                          skipprompt=self.skipprompt())
         if n is None:
             return ctx, []
-        hg.updaterepo(repo, n, False)
+        hg.updaterepo(repo, n, overwrite=False)
         replacements = [(oldctx.node(), (newnode,)),
                         (ctx.node(), (n,)),
                         (newnode, (n,)),
@@ -1177,7 +1177,7 @@
 
 def _finishhistedit(ui, repo, state, fm):
     """This action runs when histedit is finishing its session"""
-    hg.updaterepo(repo, state.parentctxnode, False)
+    hg.updaterepo(repo, state.parentctxnode, overwrite=False)
 
     mapping, tmpnodes, created, ntm = processreplacement(state)
     if mapping: