Patchwork D404: filemerge: add _restorebackup

login
register
mail settings
Submitter phabricator
Date Aug. 31, 2017, 9:22 p.m.
Message ID <24baa1843b97eed83e4797e69bb2e6ca@localhost.localdomain>
Download mbox | patch
Permalink /patch/23573/
State Not Applicable
Headers show

Comments

phabricator - Aug. 31, 2017, 9:22 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfe04c018eaac: filemerge: add _restorebackup (authored by phillco).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D404?vs=1505&id=1515

REVISION DETAIL
  https://phab.mercurial-scm.org/D404

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: phillco, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -348,9 +348,7 @@ 
             return 0
         if premerge not in validkeep:
             # restore from backup and try again
-            # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
-            # util.copy here instead.
-            fcd.write(util.readfile(back), fcd.flags())
+            _restorebackup(fcd, back)
     return 1 # continue merging
 
 def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
@@ -590,6 +588,11 @@ 
         "o": " [%s]" % labels[1],
     }
 
+def _restorebackup(fcd, back):
+    # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
+    # util.copy here instead.
+    fcd.write(util.readfile(back), fcd.flags())
+
 def _makebackup(repo, ui, fcd, premerge):
     """Makes a backup of the local `fcd` file prior to merging.