D404: filemerge: add _restorebackup
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Wed Aug 23 15:38:39 EDT 2017
phillco updated this revision to Diff 1225.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D404?vs=913&id=1225
REVISION DETAIL
https://phab.mercurial-scm.org/D404
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
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):
@@ -591,6 +589,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.
To: phillco, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list