This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8515

filemerge: add a hacktastic version of internal:merge3 for merge diffs
ClosedPublic

Authored by durin42 on May 11 2020, 6:48 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG63dfaca9087f: filemerge: add a hacktastic version of internal:merge3 for merge diffs
Summary

This is a version of merge3 that always reports success, so that
conflict markers get preserved without us having to implement conflict
storage for in-memory merge. Credit to martinvonz for the idea. The
only planned consumer of this "merge tool" is my upcoming merge-diffs
functionality, though I suspect it could be useful in other ways.

Diff Detail

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

Event Timeline

durin42 created this revision.May 11 2020, 6:48 PM
durin42 updated this revision to Diff 21345.May 11 2020, 6:55 PM
durin42 updated this revision to Diff 21514.May 28 2020, 4:27 PM
marmoute added a subscriber: marmoute.Jun 8 2020, 2:06 PM

Is this to represent conflict for in-memory merge ? Or to help with the "merge diff" display ? Because I am not sure how it help (or is used) in the first case, but I can see it tremendously useful for mergediff (since it show how conflict got resolved)

durin42 added a comment.Jun 9 2020, 4:44 PM
In D8515#128625, @marmoute wrote:

Is this to represent conflict for in-memory merge ? Or to help with the "merge diff" display ? Because I am not sure how it help (or is used) in the first case, but I can see it tremendously useful for mergediff (since it show how conflict got resolved)

It's basically for mergediffs. I'll revise the commit message.

durin42 edited the summary of this revision. (Show Details)Jun 9 2020, 4:51 PM
marmoute added a comment.Jun 10 2020, 4:49 AM
In D8515#128781, @durin42 wrote:
In D8515#128625, @marmoute wrote:

Is this to represent conflict for in-memory merge ? Or to help with the "merge diff" display ? Because I am not sure how it help (or is used) in the first case, but I can see it tremendously useful for mergediff (since it show how conflict got resolved)

It's basically for mergediffs. I'll revise the commit message.

Can you also clearly state the intended usage in the documentation of the merge tool itself. Can you update you update diff in that direction ?

durin42 updated this revision to Diff 21614.Jun 11 2020, 12:07 PM
durin42 updated this revision to Diff 21624.Jun 11 2020, 3:46 PM
marmoute requested changes to this revision.Jul 31 2020, 12:03 PM

According to IRC discussion, this series is not ready for review, so moving it out of yadda.

This revision now requires changes to proceed.Jul 31 2020, 12:03 PM
durin42 planned changes to this revision.Jan 19 2021, 1:54 PM
durin42 updated this revision to Diff 25159.
pulkit accepted this revision.Jan 21 2021, 6:17 AM
durin42 added a commit: rHG63dfaca9087f: filemerge: add a hacktastic version of internal:merge3 for merge diffs.Jan 21 2021, 7:24 AM
This revision was not accepted when it landed; it landed in state Changes Planned.
Closed by commit rHG63dfaca9087f: filemerge: add a hacktastic version of internal:merge3 for merge diffs (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (13 lines)

Diff 21345

mercurial/filemerge.py

the partially merged file. Marker will have three sections, one from each the partially merged file. Marker will have three sections, one from each
side of the merge and one for the base content.""" side of the merge and one for the base content."""
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
if len(labels) < 3: if len(labels) < 3:
labels.append(b'base') labels.append(b'base')
return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels) return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
@internaltool(
b'merge3-lie-about-conflicts',
fullmerge,
b'',
precheck=_mergecheck,
)
def _imerge3alwaysgood(*args, **kwargs):
b1, junk, b2 = _imerge3(*args, **kwargs)
# TODO is this right? I'm not sure what these return values mean,
# but as far as I can tell this will indicate to callers tha the
# merge succeeded.
return b1, False, b2
def _imergeauto( def _imergeauto(
repo, repo,
mynode, mynode,
orig, orig,
fcd, fcd,
fco, fco,
fca, fca,