Page MenuHomePhabricator

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

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

Details

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 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
This revision was automatically updated to reflect the committed changes.