inspirehep / inspire-json-merger Goto Github PK

View Code? Open in Web Editor NEW

3.0 18.0 13.0 377 KB

INSPIRE-specific configuration of the JSON Merger.

License: GNU General Public License v3.0

Python 99.46% Shell 0.54%

inspirehep python json

inspire-json-merger's Introduction

INSPIRE-JSON-Merger

About

INSPIRE-specific configuration of the JSON Merger.

inspire-json-merger's People

Contributors

Stargazers

Watchers

Forkers

rikirenz ammirate jmartinm chris-asl michamos harunurhan drjova david-caro vbalbp pazembrz mjedr oguzdemirbasci nooraangelva

inspire-json-merger's Issues

docs: integrate Sphinx and ReadTheDocs

Because it's the right thing to do.

inspire-json-merger change

After discussion with Micha we suggest as follows:

Add ordering information for authors input dictionary so we could keep ordering of authors.
Ignore root from merged conflicts
Before flattening and serializing to JSON patch, MERGE conflict looks like this:
('MANUAL_MERGE', ('authors',), ( pmap(<ROOT>), pmap(<HEAD>), pmap(<UPDATE>) )),
Before flattening conflicts, take out all MANUAL_MERGE and do as follows:

Remove/Ignore ROOT
Update merged result with HEAD from conflict by inserting the author from HEAD at the right position .
Look for ADD_BACK_TO_HEAD conflict with identical content as HEAD change and remove it as it's already added to HEAD
serialize the UPDATE from conflict as a replace JSON patch at the right position

Remove all positioning information form author dictionary.

This should result in less conflicts in editor, also should allow to achieve behavior of getting HEAD when dismissing all conflicts.

Originally posted by @pazembrz in inspirehep/inspirehep#1110 (comment)

Change `ADD_BACK_TO_HEAD` conflict to generate `delete` patch

When UPDATE removes something from HEAD json_merger generates ADD_BACK_TO_HEAD conflict. Now it's just interpreted as it is so in merged value is absent and in patch we have an add of HEAD value, but we want it to work in opposite way. So in merged we should have value from HEAD and patch should be a delete.

Create boilerplate for repo (travis, readthedocs, ...)

Change default behaviour for conflicts

All conflicts should be displayed as changes form head. For conflicts which do not have separate configuration If there is conflict on update, then HEAD value should be in merged and update should be put as conflict. So when curator reject all conflicts only HEAD values should be left. This will require to set default fallback conflict strategy to KEEP_HEAD.
All conflicts which we are ignoring (ones from conflict_filters) should stay with HEAD values if they are not configured differently.