Patchwork D400: filemerge: move a util copy call to filectx.write

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

Comments

phabricator - Aug. 31, 2017, 7:45 p.m.
phillco updated this revision to Diff 1502.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D400?vs=1487&id=1502

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

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,7 +348,9 @@ 
             return 0
         if premerge not in validkeep:
             # restore from backup and try again
-            util.copyfile(back, repo.wjoin(fcd.path()))
+            # TODO: Add a workingfilectx.write(otherfilectx) path so we can use
+            # util.copy here instead.
+            fcd.write(util.readfile(back), fcd.flags())
     return 1 # continue merging
 
 def _mergecheck(repo, mynode, orig, fcd, fco, fca, toolconf):
@@ -587,7 +589,7 @@ 
 
 def _makebackup(repo, ui, fcd, premerge):
     """Makes a backup of the local `fcd` file prior to merging.
-    
+
     In addition to preserving the user's pre-existing modifications to `fcd`
     (if any), the backup is used to undo certain premerges, confirm whether a
     merge changed anything, and determine what line endings the new file should