D12102: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12102 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12107: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12107 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12113: convert: use the merge action constant

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The constant exists, lets use them. Otherwise we cannot make these constant more powerful. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12104: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY (even if not fully satisfied this time) REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12104 AFFECTED FILES

D12114: merge-actions: make merge action a full featured object

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This open the way for having "smarter" value as action, making the usage code simpler and more flexible. We have to explicitly use __bytes__ call in a

D12106: merge: break up two not-so-one-liner for extra readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12106 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12109: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12109 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12105: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12105 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12112: large-file: use the merge action constant

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY The constant exists, lets use them. Otherwise we cannot make these constant more powerful. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12111: merge: stop using merge action for pathconflict option

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is not the b'r' you are looking for. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12111 AFFECTED FILES

D12115: merge-actions: gather all created action into a set

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This is mostly to demonstrate we can do this before we start adding more specialized set. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL

D12101: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12101 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12108: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12108 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12110: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12110 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git

D12116: merge-actions: add an explicite "no_op" attribute

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REVISION SUMMARY This make the MergeAction smarter and able to describe themself. This is useful to help introducing more MergeAction object that better the complexity of the

D12103: merge: break up a not-so-one-liner for readability

marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12103 AFFECTED FILES mercurial/merge.py CHANGE DETAILS diff --git