This is an archive of the discontinued Mercurial Phabricator instance.

Differential D617

filemerge: use fctx.write() in the internal:dump tool, instead of copy
ClosedPublic

Authored by phillco on Sep 3 2017, 3:41 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcd38b83bfb23: filemerge: use fctx.write() in the internal:dump tool, instead of copy
Summary

This is slower but allows this tool to work with the "deferred writes"
milestone of in-memory merge.

The performance hit is not too noticiable since this only used for the :dump
merge tool during a conflict.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

phillco created this revision.Sep 3 2017, 3:41 PM
martinvonz added a subscriber: martinvonz.Sep 5 2017, 11:51 AM
martinvonz added inline comments.
mercurial/filemerge.py
471

Wasn't this what decodeddata() was for? I.e., something like

util.writefile(a + ".local", fcd.decoded())
phillco added inline comments.Sep 5 2017, 2:54 PM
mercurial/filemerge.py
471

It is, good point! This patch actually predates that function :) I'll send a revision.

phillco updated this revision to Diff 1617.Sep 5 2017, 5:00 PM
Closed by commit rHGcd38b83bfb23: filemerge: use fctx.write() in the internal:dump tool, instead of copy (authored by phillco). · Explain WhySep 5 2017, 5:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (2 lines)

Diff 1617

mercurial/filemerge.py

same directory as ``a.txt``. same directory as ``a.txt``.
This implies permerge. Therefore, files aren't dumped, if premerge This implies permerge. Therefore, files aren't dumped, if premerge
runs successfully. Use :forcedump to forcibly write files out. runs successfully. Use :forcedump to forcibly write files out.
""" """
a = _workingpath(repo, fcd) a = _workingpath(repo, fcd)
fd = fcd.path() fd = fcd.path()
util.copyfile(a, a + ".local") util.writefile(a + ".local", fcd.decodeddata())
martinvonzUnsubmitted
Not Done

Wasn't this what decodeddata() was for? I.e., something like

util.writefile(a + ".local", fcd.decoded())
martinvonz: Wasn't this what decodeddata() was for? I.e., something like util.writefile(a + ".local"…
phillcoAuthorUnsubmitted
Not Done

It is, good point! This patch actually predates that function :) I'll send a revision.

phillco: It is, good point! This patch actually predates that function :) I'll send a revision.
repo.wwrite(fd + ".other", fco.data(), fco.flags()) repo.wwrite(fd + ".other", fco.data(), fco.flags())
repo.wwrite(fd + ".base", fca.data(), fca.flags()) repo.wwrite(fd + ".base", fca.data(), fca.flags())
return False, 1, False return False, 1, False
@internaltool('forcedump', mergeonly) @internaltool('forcedump', mergeonly)
def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files, def _forcedump(repo, mynode, orig, fcd, fco, fca, toolconf, files,
labels=None): labels=None):
""" """