comparison mercurial/configitems.py @ 45579:b9d6ab6cdeb4

configitems: add a new config option to control new filenode functionality

This series is adding functionality where we can force create a new filenode for
some files on a merge-commit. This is meant to represent an explicit choice made
by user and hence distingusing the file in the merged commit with the file in
parent by creating a new filenode instead of using the parent one.

This introduces a experimental config option under which this functionality
will be hidden.

A new testcase is added in tests/test-merge-criss-cross.t to test the new
functionality while making the option does not break other scenarios.

Differential Revision: https://phab.mercurial-scm.org/D9026

45578:f9a3edf2dee4

    b'experimental', b'extra-filter-revs', default=None,
)
coreconfigitem(
    b'experimental', b'maxdeltachainspan', default=-1,
)
coreconfigitem(
    b'experimental', b'mergetempdirprefix', default=None,
)
coreconfigitem(
    b'experimental', b'mmapindexthreshold', default=None,

45579:b9d6ab6cdeb4

    b'experimental', b'extra-filter-revs', default=None,
)
coreconfigitem(
    b'experimental', b'maxdeltachainspan', default=-1,
)
# tracks files which were undeleted (merge might delete them but we explicitly
# kept/undeleted them) and creates new filenodes for them
coreconfigitem(
    b'experimental', b'merge-track-salvaged', default=False,
)
coreconfigitem(
    b'experimental', b'mergetempdirprefix', default=None,
)
coreconfigitem(
    b'experimental', b'mmapindexthreshold', default=None,