Patchwork D1213: merge: remove calls to flushall()

login
register
mail settings
Submitter phabricator
Date Dec. 7, 2017, 7:48 p.m.
Message ID <c84f4012d7c80435475bff3674105acd@localhost.localdomain>
Download mbox | patch
Permalink /patch/26004/
State Not Applicable
Headers show

Comments

phabricator - Dec. 7, 2017, 7:48 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG46510597d266: merge: remove calls to flushall() (authored by phillco, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1213?vs=3552&id=4170

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1333,10 +1333,6 @@ 
         repo.ui.warn(_("current directory was removed\n"
                        "(consider changing to repo root: %s)\n") % repo.root)
 
-    # It's necessary to flush here in case we're inside a worker fork and will
-    # quit after this function.
-    wctx.flushall()
-
 def batchget(repo, mctx, wctx, actions):
     """apply gets to the working directory
 
@@ -1376,9 +1372,6 @@ 
     if i > 0:
         yield i, f
 
-    # It's necessary to flush here in case we're inside a worker fork and will
-    # quit after this function.
-    wctx.flushall()
 
 def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
     """apply the merge action list to the working directory
@@ -1479,10 +1472,6 @@ 
         z += 1
         progress(_updating, z, item=f, total=numupdates, unit=_files)
 
-    # We should flush before forking into worker processes, since those workers
-    # flush when they complete, and we don't want to duplicate work.
-    wctx.flushall()
-
     # get in parallel
     prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
                          actions['g'])
@@ -2004,7 +1993,6 @@ 
                   'see "hg help -e fsmonitor")\n'))
 
         stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
-        wc.flushall()
 
         if not partial:
             with repo.dirstate.parentchange():