| hg-reviewers |
Let's make sure that the config is also enabled before disabling the m2-vs-ma
optimization.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (8 lines) |
| # care for the dirty state of the working directory. | # care for the dirty state of the working directory. | ||||
| if any(wctx.sub(s).dirty() for s in wctx.substate): | if any(wctx.sub(s).dirty() for s in wctx.substate): | ||||
| m1[b'.hgsubstate'] = modifiednodeid | m1[b'.hgsubstate'] = modifiednodeid | ||||
| # Don't use m2-vs-ma optimization if: | # Don't use m2-vs-ma optimization if: | ||||
| # - ma is the same as m1 or m2, which we're just going to diff again later | # - ma is the same as m1 or m2, which we're just going to diff again later | ||||
| # - The caller specifically asks for a full diff, which is useful during bid | # - The caller specifically asks for a full diff, which is useful during bid | ||||
| # merge. | # merge. | ||||
| if pa not in ([wctx, p2] + wctx.parents()) and not forcefulldiff: | # - we are tracking salvaged files specifically hence should process all | ||||
| # files | |||||
| if ( | |||||
| pa not in ([wctx, p2] + wctx.parents()) | |||||
| and not forcefulldiff | |||||
| and not repo.ui.configbool(b'experimental', b'merge-track-salvaged') | |||||
| ): | |||||
| # 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): | ||||
| if copyvalue in relevantfiles: | if copyvalue in relevantfiles: | ||||