Page MenuHomePhabricator

simplemerge: take over formatting of label from `filemerge`
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Summary

The padding we do of conflict labels depends on which conflict marker
style is used. For two-way conflict markers (the default), the length
of the base label shouldn't matter. It does before this patch,
however. This patch moves the formatting from filemerge to
simplemerge. The latter knows which conflict marker style to use, so
it can easily decide about the padding.

This change will allow us to use more descriptive "base" labels
without causing illogical padding in 2-way markers. I'll do that next.

One wrinkle is that we pass the same labels to external merge tools. I
decided to change that in this patch to be simpler: no padding, and no
ellipsis to fit within 80 columns. My reasoning is that the typical
external, 3-or-4-panel merge tool doesn't show the labels on top of
each others, so the padding doesn't make sense there. The ellipsis is
probably not necessary because the external tools probably have their
own way of dealing with long labels. Also, we limit them to "80 - 8"
to fit the "<<<<<<< " before, which is almost definitely not what an
external tool would put there.

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.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 5:29 AM
Alphare added a subscriber: Alphare.

I'm not requesting changes in this patch per se, but it seems like the right place to ask for another patch to update the relnotes for backwards compat reasons. I don't think we're going to break much, but it's good to be explicit and will save me some time in the 6.1 release work.

This revision is now accepted and ready to land.Jan 24 2022, 5:29 AM

I'm not requesting changes in this patch per se, but it seems like the right place to ask for another patch to update the relnotes for backwards compat reasons. I don't think we're going to break much, but it's good to be explicit and will save me some time in the 6.1 release work.

Ah, of course! I've added a note in this patch about the changed formatting. I've also added a separate patch with a note about changed label texts.

Alphare accepted this revision.Jan 24 2022, 11:49 AM