This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9026

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

Authored by pulkit on Sep 17 2020, 5:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb9d6ab6cdeb4: configitems: add a new config option to control new filenode functionality
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Sep 17 2020, 5:48 AM
pulkit added a commit: rHGb9d6ab6cdeb4: configitems: add a new config option to control new filenode functionality.Sep 28 2020, 7:20 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb9d6ab6cdeb4: configitems: add a new config option to control new filenode functionality (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 22869

mercurial/configitems.py

# The target use case is to use `share` to expose different subset of the same # The target use case is to use `share` to expose different subset of the same
# repository, especially server side. See also `server.view`. # repository, especially server side. See also `server.view`.
coreconfigitem( coreconfigitem(
b'experimental', b'extra-filter-revs', default=None, b'experimental', b'extra-filter-revs', default=None,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'maxdeltachainspan', default=-1, 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( coreconfigitem(
b'experimental', b'mergetempdirprefix', default=None, b'experimental', b'mergetempdirprefix', default=None,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'mmapindexthreshold', default=None, b'experimental', b'mmapindexthreshold', default=None,
) )
coreconfigitem( coreconfigitem(
b'experimental', b'narrow', default=False, b'experimental', b'narrow', default=False,

tests/test-merge-criss-cross.t

#testcases old newfilenode
#if newfilenode
Enable the config option
------------------------
$ cat >> $HGRCPATH <<EOF
> [experimental]
> merge-track-salvaged = True
> EOF
#endif
Criss cross merging Criss cross merging
$ hg init criss-cross $ hg init criss-cross
$ cd criss-cross $ cd criss-cross
$ echo '0 base' > f1 $ echo '0 base' > f1
$ echo '0 base' > f2 $ echo '0 base' > f2
$ hg ci -Aqm '0 base' $ hg ci -Aqm '0 base'