Skip to content

[feat] Add configurable conflict handling#141

Merged
slarse merged 2 commits intomasterfrom
issue/139-make-conflict-handlers-pluggable
May 27, 2020
Merged

[feat] Add configurable conflict handling#141
slarse merged 2 commits intomasterfrom
issue/139-make-conflict-handlers-pluggable

Conversation

@slarse
Copy link
Copy Markdown
Collaborator

@slarse slarse commented May 27, 2020

Fix #139
Fix #140

This PR adds configurability for conflict handling. It's currently not exposed to the user, it's mostly a proof-of-concept for later adding a plugin system.

The OptimisticInsertInsertHandler is an example of an extension to conflict handling that previously was not there.

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #141 into master will decrease coverage by 0.18%.
The diff coverage is 77.41%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #141      +/-   ##
============================================
- Coverage     82.19%   82.01%   -0.19%     
- Complexity      500      507       +7     
============================================
  Files            38       41       +3     
  Lines          1820     1840      +20     
  Branches        269      271       +2     
============================================
+ Hits           1496     1509      +13     
- Misses          209      212       +3     
- Partials        115      119       +4     
Impacted Files Coverage Δ Complexity Δ
...a/se/kth/spork/spoon/conflict/ContentConflict.java 100.00% <ø> (ø) 5.00 <0.00> (?)
...e/kth/spork/spoon/conflict/StructuralConflict.java 85.29% <ø> (ø) 16.00 <0.00> (?)
.../kth/spork/spoon/pcsinterpreter/ContentMerger.java 80.00% <ø> (ø) 36.00 <0.00> (ø)
...h/spork/spoon/pcsinterpreter/SpoonTreeBuilder.java 87.96% <ø> (-0.76%) 42.00 <0.00> (-1.00)
...a/se/kth/spork/spoon/pcsinterpreter/SporkTree.java 87.50% <ø> (ø) 15.00 <0.00> (ø)
...e/kth/spork/spoon/printer/PrinterPreprocessor.java 83.75% <ø> (ø) 19.00 <0.00> (ø)
...se/kth/spork/spoon/printer/SporkPrettyPrinter.java 88.73% <ø> (ø) 24.00 <0.00> (ø)
.../spoon/conflict/MethodOrderingConflictHandler.java 50.00% <50.00%> (ø) 6.00 <6.00> (?)
.../spoon/conflict/OptimisticInsertInsertHandler.java 75.00% <75.00%> (ø) 5.00 <5.00> (?)
...rc/main/java/se/kth/spork/spoon/Spoon3dmMerge.java 98.54% <100.00%> (+0.01%) 20.00 <0.00> (ø)
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ba51013...f388e3c. Read the comment docs.

@slarse slarse merged commit acaf26d into master May 27, 2020
@slarse slarse deleted the issue/139-make-conflict-handlers-pluggable branch February 18, 2021 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add an optimistic conflict handler when one side of the conflict is empty Make conflict resolution "pluggable"

2 participants