This is an archive of the discontinued Mercurial Phabricator instance.

Differential D627

filemerge: flush if using deferred writes when running a merge tool
ClosedPublic

Authored by phillco on Sep 4 2017, 9:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9c07cff039bc: filemerge: flush if using deferred writes when running a merge tool
Summary

Since merge tools might read from the filesystem, we need to write out our
deferred writes here.

No-ops if not using deferred writes.

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 created this revision.Sep 4 2017, 9:42 PM
martinvonz added a subscriber: martinvonz.Sep 7 2017, 11:44 AM
martinvonz added inline comments.
mercurial/filemerge.py
492–495

As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead (~line 677) and we won't need to pass the wctx to all the merge tools (i.e. drop D450).

phillco updated this revision to Diff 1668.Sep 7 2017, 12:32 PM
phillco updated this revision to Diff 1671.Sep 7 2017, 12:58 PM
quark added a subscriber: quark.Sep 8 2017, 3:18 PM

As mentioned in the previous patch. I think it's cleaner to just call wctx.flushall() if the other wctx class has that method.

phillco updated this revision to Diff 1700.Sep 10 2017, 11:55 PM
Closed by commit rHG9c07cff039bc: filemerge: flush if using deferred writes when running a merge tool (authored by phillco). · Explain WhySep 12 2017, 6:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (5 lines)

Diff 1769

mercurial/filemerge.py

def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
tool, toolpath, binary, symlink = toolconf tool, toolpath, binary, symlink = toolconf
if fcd.isabsent() or fco.isabsent(): if fcd.isabsent() or fco.isabsent():
repo.ui.warn(_('warning: %s cannot merge change/delete conflict ' repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
'for %s\n') % (tool, fcd.path())) 'for %s\n') % (tool, fcd.path()))
return False, 1, None return False, 1, None
unused, unused, unused, back = files unused, unused, unused, back = files
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
b, c = _maketempfiles(repo, fco, fca) b, c = _maketempfiles(repo, fco, fca)
try: try:
out = "" out = ""
martinvonzUnsubmitted
Not Done

As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead (~line 677) and we won't need to pass the wctx to all the merge tools (i.e. drop D450).

martinvonz: As Phil and I talked about out-of-band, it seems like this can be done in _filemerge() instead…
env = {'HG_FILE': fcd.path(), env = {'HG_FILE': fcd.path(),
'HG_MY_NODE': short(mynode), 'HG_MY_NODE': short(mynode),
'HG_OTHER_NODE': str(fco.changectx()), 'HG_OTHER_NODE': str(fco.changectx()),
'HG_BASE_NODE': str(fca.changectx()), 'HG_BASE_NODE': str(fca.changectx()),
'HG_MY_ISLINK': 'l' in fcd.flags(), 'HG_MY_ISLINK': 'l' in fcd.flags(),
'HG_OTHER_ISLINK': 'l' in fco.flags(), 'HG_OTHER_ISLINK': 'l' in fco.flags(),
'HG_BASE_ISLINK': 'l' in fca.flags(), 'HG_BASE_ISLINK': 'l' in fca.flags(),
} }
onfailure = func.onfailure onfailure = func.onfailure
precheck = func.precheck precheck = func.precheck
else: else:
func = _xmerge func = _xmerge
mergetype = fullmerge mergetype = fullmerge
onfailure = _("merging %s failed!\n") onfailure = _("merging %s failed!\n")
precheck = None precheck = None
# If using deferred writes, must flush any deferred contents if running
# an external merge tool since it has arbitrary access to the working
# copy.
wctx.flushall()
toolconf = tool, toolpath, binary, symlink toolconf = tool, toolpath, binary, symlink
if mergetype == nomerge: if mergetype == nomerge:
r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
return True, r, deleted return True, r, deleted
if premerge: if premerge:
if orig != fco.path(): if orig != fco.path():