D1060: filemerge: add a missing flushall()

Submitter	phabricator
Date	Oct. 13, 2017, 7:46 p.m.
Message ID	<differential-rev-PHID-DREV-qbkj7uzyzytofhigqwnr-req@phab.mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/24852/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Fri, 13 Oct 2017 19:46:04 +0000 To: mercurial-devel@mercurial-scm.org From: "phillco (Phil Cohen)" <phabricator@mercurial-scm.org> Subject: D1060: filemerge: add a missing flushall() Message-ID: <differential-rev-PHID-DREV-qbkj7uzyzytofhigqwnr-req@phab.mercurial-scm.org> Thread-Topic: D1060: filemerge: add a missing flushall() Precedence: bulk Thread-Index: NDIwMjMxZGU2OWNjNWEzMTQ0NWUxZjcxZTJl MIME-Version: 1.0 Reply-To: phabricator+D1060+public+d661c5f7a496c8c4@mercurial-scm.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Oct. 13, 2017, 7:46 p.m.

phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

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
@@ -467,6 +467,12 @@ 
     a = _workingpath(repo, fcd)
     fd = fcd.path()
 
+    # Run ``flushall()`` to make any missing folders the following wwrite
+    # calls might be depending on.
+    from . import context
+    if isinstance(fcd, context.overlayworkingfilectx):
+        fcd.ctx().flushall()
+
     util.writefile(a + ".local", fcd.decodeddata())
     repo.wwrite(fd + ".other", fco.data(), fco.flags())
     repo.wwrite(fd + ".base", fca.data(), fca.flags())

Patchwork D1060: filemerge: add a missing flushall()

Comments

Patch