( )⚙ D3975 mergetool: warn if ui.merge points to nonexistent tool

This is an archive of the discontinued Mercurial Phabricator instance.

mergetool: warn if ui.merge points to nonexistent tool
ClosedPublic

Authored by martinvonz on Jul 24 2018, 2:37 AM.

Details

Summary

This adds a warning when ui.merge is configured but points to an
executable that doesn't exist. It gets printed once per fail, but that
seems to be how our other warnings about merge tools are reported.

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

martinvonz created this revision.Jul 24 2018, 2:37 AM
lothiraldan accepted this revision.Jul 24 2018, 4:30 AM

Just a reminder that this is ready to be queued now that the freeze is over (I understand that it wasn't queued during the freeze).

yuja added a subscriber: yuja.Aug 8 2018, 8:04 AM

Queued, thanks.

$ hg merge -y -r 2 --config ui.merge=missingbinary

+ couldn't find merge tool missingbinary (for pattern f)

Nit: "for pattern f" seems misleading since ui.merge is not defined per
filename pattern.

This revision was automatically updated to reflect the committed changes.