This is an archive of the discontinued Mercurial Phabricator instance.

simplemerge: let filemerge check for binary inputs
ClosedPublic

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

Details

Summary

This is similar to the previous patch, but here we put a specialized
copy of simplemerge._verifytext() in the the filemerge module
instead.

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

I am not entirely sure if removing the check from simplemerge is a good idea, new callers would need to think to verify the text beforehand. Maybe a _verified attribute could be used to skip the check if already done?

martinvonz planned changes to this revision.Feb 9 2022, 11:23 AM

I am not entirely sure if removing the check from simplemerge is a good idea, new callers would need to think to verify the text beforehand. Maybe a _verified attribute could be used to skip the check if already done?

Yes, that's fair. I'll refactor this in some way. I'd still like to remove the ui argument from simplemerge() because it seems like a library function to me (though I know we don't separate between library and UI almost anywhere :)).

martinvonz retitled this revision from simplemerge: let users call verifytext() to simplemerge: let filemerge check for binary inputs.
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 32136.
Alphare accepted this revision.Feb 14 2022, 5:40 AM
This revision is now accepted and ready to land.Feb 14 2022, 5:40 AM
This revision was automatically updated to reflect the committed changes.