| hg-reviewers |
Let's make sure that the config is also enabled before disabling the m2-vs-ma
optimization.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (1 line) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 6f55bbcae7a2 | 83be7a1aa84f | Pulkit Goyal | Sep 14 2020, 5:10 AM |
| # | # | ||||
| # Rebasing recent changesets is more common case than rebasing a cset | # Rebasing recent changesets is more common case than rebasing a cset | ||||
| # which is 10k commits old | # which is 10k commits old | ||||
| # Hence let's disable this optimization for flat manifests | # Hence let's disable this optimization for flat manifests | ||||
| if ( | if ( | ||||
| pa not in ([wctx, p2] + wctx.parents()) | pa not in ([wctx, p2] + wctx.parents()) | ||||
| and not forcefulldiff | and not forcefulldiff | ||||
| and scmutil.istreemanifest(repo) | and scmutil.istreemanifest(repo) | ||||
| and repo.ui.configbool(b'experimental', b'merge-track-undeleted') | |||||
| ): | ): | ||||
| # Identify which files are relevant to the merge, so we can limit the | # Identify which files are relevant to the merge, so we can limit the | ||||
| # total m1-vs-m2 diff to just those files. This has significant | # total m1-vs-m2 diff to just those files. This has significant | ||||
| # performance benefits in large repositories. | # performance benefits in large repositories. | ||||
| relevantfiles = set(ma.diff(m2).keys()) | relevantfiles = set(ma.diff(m2).keys()) | ||||
| # For copied and moved files, we need to add the source file too. | # For copied and moved files, we need to add the source file too. | ||||
| for copykey, copyvalue in pycompat.iteritems(branch_copies1.copy): | for copykey, copyvalue in pycompat.iteritems(branch_copies1.copy): | ||||