# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 2017-08-31 18:28:59
# Node ID fe04c018eaac15ea48f2611f3d07978ba1044126
# Parent  96123bdea43eaeaa292e60f1e3a1a7bcb092c9c7

filemerge: add _restorebackup

Differential Revision: https://phab.mercurial-scm.org/D404

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -348,9 +348,7 @@ def _premerge(repo, fcd, fco, fca, toolc
             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 @@ def partextras(labels):
         "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.