This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11853

simplemerge: set `conflicts` earlier for :union tool
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9e1f174d305b: simplemerge: set `conflicts` earlier for :union tool

Diff Detail

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

Event Timeline

martinvonz created this revision.Dec 4 2021, 2:06 AM
Alphare accepted this revision.Dec 7 2021, 10:10 AM
This revision is now accepted and ready to land.Dec 7 2021, 10:10 AM
martinvonz added a commit: rHG9e1f174d305b: simplemerge: set `conflicts` earlier for :union tool.Dec 8 2021, 3:17 AM
Closed by commit rHG9e1f174d305b: simplemerge: set `conflicts` earlier for :union tool (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/simplemerge.py (4 lines)

Diff 31305

mercurial/simplemerge.py

if mode == b'mergediff': if mode == b'mergediff':
lines, conflicts = _mergediff(m3, name_a, name_b, name_base) lines, conflicts = _mergediff(m3, name_a, name_b, name_base)
else: else:
lines = list( lines = list(
m3.merge_lines( m3.merge_lines(
name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs) name_a=name_a, name_b=name_b, **pycompat.strkwargs(extrakwargs)
) )
) )
conflicts = m3.conflicts conflicts = m3.conflicts and not mode == b'union'
# merge flags if necessary # merge flags if necessary
flags = localctx.flags() flags = localctx.flags()
localflags = set(pycompat.iterbytestr(flags)) localflags = set(pycompat.iterbytestr(flags))
otherflags = set(pycompat.iterbytestr(otherctx.flags())) otherflags = set(pycompat.iterbytestr(otherctx.flags()))
if is_not_null(basectx) and localflags != otherflags: if is_not_null(basectx) and localflags != otherflags:
baseflags = set(pycompat.iterbytestr(basectx.flags())) baseflags = set(pycompat.iterbytestr(basectx.flags()))
commonflags = localflags & otherflags commonflags = localflags & otherflags
addedflags = (localflags ^ otherflags) - baseflags addedflags = (localflags ^ otherflags) - baseflags
flags = b''.join(sorted(commonflags | addedflags)) flags = b''.join(sorted(commonflags | addedflags))
mergedtext = b''.join(lines) mergedtext = b''.join(lines)
if opts.get('print'): if opts.get('print'):
ui.fout.write(mergedtext) ui.fout.write(mergedtext)
else: else:
localctx.write(mergedtext, flags) localctx.write(mergedtext, flags)
if conflicts and not mode == b'union': if conflicts:
return 1 return 1