This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11391

filemerge: be more strict when detecting conflict markers, add `|` markers
ClosedPublic

Authored by spectral on Sep 7 2021, 3:12 PM.

Details

Reviewers
Alphare
pulkit
Group Reviewers
hg-reviewers
Commits
rHG053dd53a0b59: filemerge: be more strict when detecting conflict markers, add `|` markers
Summary

I received a user complaint about detecting a line that contained 78 =
followed by */ as a conflict marker. We'll never generate that, we generate 7
identical characters and either the end of the line, or a space. Let's be
explicit about detecting exactly what we produce to reduce the chances of a
false positive.

While we're here, add ||||||| as a detected conflict marker (generated with
the keep-merge3 style conflicts).

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

spectral created this revision.Sep 7 2021, 3:12 PM
Alphare accepted this revision.Sep 8 2021, 8:58 AM
This revision is now accepted and ready to land.Sep 8 2021, 8:58 AM
Alphare added a comment.Sep 8 2021, 8:59 AM

I'll send this on stable since I would say that's a bug.

pulkit accepted this revision.Sep 8 2021, 2:12 PM
pulkit added a subscriber: pulkit.

I will queue this for stable branch.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (6 lines)

Diff 30187

mercurial/filemerge.py

if ui.promptchoice(msg, 0) == 1: if ui.promptchoice(msg, 0) == 1:
_haltmerge() _haltmerge()
if action == b'halt': if action == b'halt':
_haltmerge() _haltmerge()
# default action is 'continue', in which case we neither prompt nor halt # default action is 'continue', in which case we neither prompt nor halt
def hasconflictmarkers(data): def hasconflictmarkers(data):
# Detect lines starting with a string of 7 identical characters from the
# subset Mercurial uses for conflict markers, followed by either the end of
# line or a space and some text. Note that using [<>=+|-]{7} would detect
# `<><><><><` as a conflict marker, which we don't want.
return bool( return bool(
re.search( re.search(
br"^(<<<<<<<.*|=======.*|------- .*|\+\+\+\+\+\+\+ .*|>>>>>>>.*)$", br"^([<>=+|-])\1{6}( .*)$",
data, data,
re.MULTILINE, re.MULTILINE,
) )
) )
def _check(repo, r, ui, tool, fcd, files): def _check(repo, r, ui, tool, fcd, files):
fd = fcd.path() fd = fcd.path()