( )⚙ D12148 simplemerge: move printing of merge result to extension

This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: move printing of merge result to extension
ClosedPublic

Authored by martinvonz on Feb 8 2022, 4:26 PM.

Details

Summary

The mercurial.simplemerge module still has some command-lines
processing that doesn't belong in such a low-level module. This patch
moves the handling of hg simplemerge --print to the extension by
having mercurial.simplemerge.simplemerge() return the merged text.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Feb 8 2022, 4:26 PM
Alphare added inline comments.
contrib/simplemerge
115

Shouldn't this be using util.writefile?

martinvonz marked an inline comment as done.Feb 14 2022, 11:28 AM
Alphare accepted this revision.Feb 15 2022, 7:52 AM
This revision is now accepted and ready to land.Feb 15 2022, 7:52 AM