This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1213

merge: remove calls to flushall()
ClosedPublic

Authored by phillco on Oct 23 2017, 3:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG46510597d266: merge: remove calls to flushall()
Summary

Since D1105, these are unnecessary since IMM will now never use workers.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco added a reviewer: hg-reviewers.Nov 15 2017, 10:46 PM
phillco set the repository for this revision to rHG Mercurial.
phillco updated this revision to Diff 3552.Nov 16 2017, 12:13 AM
phillco added a comment.Nov 16 2017, 12:16 AM

Note: This series actually starts with D1210:
https://phab.mercurial-scm.org/D1210. I submitted it without a callsign
originally which is why it did not hit the mailing list at first.

phillco set the repository for this revision to rHG Mercurial.Nov 16 2017, 1:14 AM
Closed by commit rHG46510597d266: merge: remove calls to flushall() (authored by phillco). · Explain WhyDec 7 2017, 2:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (12 lines)

Diff 4170

mercurial/merge.py

yield i, f yield i, f
if cwd and not _getcwd(): if cwd and not _getcwd():
# cwd was removed in the course of removing files; print a helpful # cwd was removed in the course of removing files; print a helpful
# warning. # warning.
repo.ui.warn(_("current directory was removed\n" repo.ui.warn(_("current directory was removed\n"
"(consider changing to repo root: %s)\n") % repo.root) "(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): def batchget(repo, mctx, wctx, actions):
"""apply gets to the working directory """apply gets to the working directory
mctx is the context to get from mctx is the context to get from
yields tuples for progress updates yields tuples for progress updates
""" """
verbose = repo.ui.verbose verbose = repo.ui.verbose
wctx[f].write(fctx(f).data(), flags, backgroundclose=True) wctx[f].write(fctx(f).data(), flags, backgroundclose=True)
if i == 100: if i == 100:
yield i, f yield i, f
i = 0 i = 0
i += 1 i += 1
if i > 0: if i > 0:
yield i, f 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): def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
"""apply the merge action list to the working directory """apply the merge action list to the working directory
wctx is the working copy context wctx is the working copy context
mctx is the context to be merged into the working copy mctx is the context to be merged into the working copy
Return a tuple of counts (updated, merged, removed, unresolved) that Return a tuple of counts (updated, merged, removed, unresolved) that
if wctx[f0].lexists(): if wctx[f0].lexists():
repo.ui.note(_("moving %s to %s\n") % (f0, f)) repo.ui.note(_("moving %s to %s\n") % (f0, f))
wctx[f].audit() wctx[f].audit()
wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags()) wctx[f].write(wctx.filectx(f0).data(), wctx.filectx(f0).flags())
wctx[f0].remove() wctx[f0].remove()
z += 1 z += 1
progress(_updating, z, item=f, total=numupdates, unit=_files) 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 # get in parallel
prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx), prog = worker.worker(repo.ui, cost, batchget, (repo, mctx, wctx),
actions['g']) actions['g'])
for i, item in prog: for i, item in prog:
z += i z += i
progress(_updating, z, item=item, total=numupdates, unit=_files) progress(_updating, z, item=item, total=numupdates, unit=_files)
updated = len(actions['g']) updated = len(actions['g'])
and len(actions['g']) >= fsmonitorthreshold and len(actions['g']) >= fsmonitorthreshold
and pycompat.sysplatform.startswith(('linux', 'darwin'))): and pycompat.sysplatform.startswith(('linux', 'darwin'))):
repo.ui.warn( repo.ui.warn(
_('(warning: large working directory being used without ' _('(warning: large working directory being used without '
'fsmonitor enabled; enable fsmonitor to improve performance; ' 'fsmonitor enabled; enable fsmonitor to improve performance; '
'see "hg help -e fsmonitor")\n')) 'see "hg help -e fsmonitor")\n'))
stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
wc.flushall()
if not partial: if not partial:
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(fp1, fp2) repo.setparents(fp1, fp2)
recordupdates(repo, actions, branchmerge) recordupdates(repo, actions, branchmerge)
# update completed, clear state # update completed, clear state
util.unlink(repo.vfs.join('updatestate')) util.unlink(repo.vfs.join('updatestate'))