If we want to use this information for copy tracing, then we need to be able to
record it.
First we unlock the recording of deletion candidates, and we will actually record
the data in the next changeset.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (5 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 62e88f6d4e5b | 6f3d7c53bc06 | Pierre-Yves David | Sep 14 2020, 5:46 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute |
| # - 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. | ||||
| # - we are tracking salvaged files specifically hence should process all | # - we are tracking salvaged files specifically hence should process all | ||||
| # files | # files | ||||
| if ( | if ( | ||||
| pa not in ([wctx, p2] + wctx.parents()) | pa not in ([wctx, p2] + wctx.parents()) | ||||
| and not forcefulldiff | and not forcefulldiff | ||||
| and not repo.ui.configbool(b'experimental', b'merge-track-salvaged') | and not ( | ||||
| repo.ui.configbool(b'experimental', b'merge-track-salvaged') | |||||
| or repo.filecopiesmode == b'changeset-sidedata' | |||||
| ) | |||||
| ): | ): | ||||
| # 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): | ||||