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
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

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 22666

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-undeleted', 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

even though the merge algo wanted to remove it. even though the merge algo wanted to remove it.
Based on this, when we do criss cross merges, merge algorithm should not again Based on this, when we do criss cross merges, merge algorithm should not again
choose to remove the file as in one of the merges, user made an explicit choice choose to remove the file as in one of the merges, user made an explicit choice
to revert the removal. to revert the removal.
Following test cases demonstrate how merge algo does not take in account Following test cases demonstrate how merge algo does not take in account
explicit choices made by users to revert the removal and on criss-cross merging explicit choices made by users to revert the removal and on criss-cross merging
removes the file again. removes the file again.
Enable the config option
------------------------
$ cat >> $HGRCPATH <<EOF
> [experimental]
> merge-track-undeleted = True
> EOF
"Simple" case where the filenode changes "Simple" case where the filenode changes
---------------------------------------- ----------------------------------------
$ cd .. $ cd ..
$ hg init criss-cross-merge-reversal-with-update $ hg init criss-cross-merge-reversal-with-update
$ cd criss-cross-merge-reversal-with-update $ cd criss-cross-merge-reversal-with-update
$ echo the-file > the-file $ echo the-file > the-file
$ echo other-file > other-file $ echo other-file > other-file