| yuja |
| hg-reviewers |
We are going to introduce a new fast heuristic based copytracing algorithm, so
lets make mergecopies the function which decides which algorithm to go with and
then calls the related function.
While I was here, I add a line in test-copy-move-merge.t saying its a test
related to the full copytracing algorithm.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/copies.py (31 lines) | |||
| M | tests/test-copy-move-merge.t (3 lines) |
| if ic[0] in copyto: | if ic[0] in copyto: | ||||
| diverge[f] = [copyto[ic[0]], ic[1]] | diverge[f] = [copyto[ic[0]], ic[1]] | ||||
| else: | else: | ||||
| remainder[f] = ic | remainder[f] = ic | ||||
| return remainder | return remainder | ||||
| def mergecopies(repo, c1, c2, base): | def mergecopies(repo, c1, c2, base): | ||||
| """ | """ | ||||
| The basic algorithm for copytracing. Copytracing is used in commands like | The function calling different copytracing algorithms on the basis of config | ||||
| rebase, merge, unshelve, etc to merge files that were moved/ copied in one | which find moves and copies between context c1 and c2 that are relevant for | ||||
| merge parent and modified in another. For example: | merging. 'base' will be used as the merge base. | ||||
| Copytracing is used in commands like rebase, merge, unshelve, etc to merge | |||||
| files that were moved/ copied in one merge parent and modified in another. | |||||
| For example: | |||||
| o ---> 4 another commit | o ---> 4 another commit | ||||
| | | | | ||||
| | o ---> 3 commit that modifies a.txt | | o ---> 3 commit that modifies a.txt | ||||
| | / | | / | ||||
| o / ---> 2 commit that moves a.txt to b.txt | o / ---> 2 commit that moves a.txt to b.txt | ||||
| |/ | |/ | ||||
| o ---> 1 merge base | o ---> 1 merge base | ||||
| If we try to rebase revision 3 on revision 4, since there is no a.txt in | If we try to rebase revision 3 on revision 4, since there is no a.txt in | ||||
| revision 4, and if user have copytrace disabled, we prints the following | revision 4, and if user have copytrace disabled, we prints the following | ||||
| message: | message: | ||||
| ```other changed <file> which local deleted``` | ```other changed <file> which local deleted``` | ||||
| If copytrace is enabled, this function finds all the new files that were | |||||
| added from merge base up to the top commit (here 4), and for each file it | |||||
| checks if this file was copied from another file (a.txt in the above case). | |||||
| Find moves and copies between context c1 and c2 that are relevant | |||||
| for merging. 'base' will be used as the merge base. | |||||
| Returns five dicts: "copy", "movewithdir", "diverge", "renamedelete" and | Returns five dicts: "copy", "movewithdir", "diverge", "renamedelete" and | ||||
| "dirmove". | "dirmove". | ||||
| "copy" is a mapping from destination name -> source name, | "copy" is a mapping from destination name -> source name, | ||||
| where source is in c1 and destination is in c2 or vice-versa. | where source is in c1 and destination is in c2 or vice-versa. | ||||
| "movewithdir" is a mapping from source name -> destination name, | "movewithdir" is a mapping from source name -> destination name, | ||||
| where the file at source present in one context but not the other | where the file at source present in one context but not the other | ||||
| # avoid silly behavior for update from empty dir | # avoid silly behavior for update from empty dir | ||||
| if not c1 or not c2 or c1 == c2: | if not c1 or not c2 or c1 == c2: | ||||
| return {}, {}, {}, {}, {} | return {}, {}, {}, {}, {} | ||||
| # avoid silly behavior for parent -> working dir | # avoid silly behavior for parent -> working dir | ||||
| if c2.node() is None and c1.node() == repo.dirstate.p1(): | if c2.node() is None and c1.node() == repo.dirstate.p1(): | ||||
| return repo.dirstate.copies(), {}, {}, {}, {} | return repo.dirstate.copies(), {}, {}, {}, {} | ||||
| copytracing = repo.ui.config('experimental', 'copytrace') | |||||
| # Copy trace disabling is explicitly below the node == p1 logic above | # Copy trace disabling is explicitly below the node == p1 logic above | ||||
| # because the logic above is required for a simple copy to be kept across a | # because the logic above is required for a simple copy to be kept across a | ||||
| # rebase. | # rebase. | ||||
| if repo.ui.config('experimental', 'copytrace') == 'off': | if copytracing == 'off': | ||||
| return {}, {}, {}, {}, {} | return {}, {}, {}, {}, {} | ||||
| else: | |||||
| return _fullcopytracing(repo, c1, c2, base) | |||||
| def _fullcopytracing(repo, c1, c2, base): | |||||
| """ The full copytracing algorithm which finds all the new files that were | |||||
| added from merge base up to the top commit and for each file it checks if | |||||
| this file was copied from another file. | |||||
| This is pretty slow when a lot of changesets are involved but will track all | |||||
| the copies. | |||||
| """ | |||||
| # In certain scenarios (e.g. graft, update or rebase), base can be | # In certain scenarios (e.g. graft, update or rebase), base can be | ||||
| # overridden We still need to know a real common ancestor in this case We | # overridden We still need to know a real common ancestor in this case We | ||||
| # can't just compute _c1.ancestor(_c2) and compare it to ca, because there | # can't just compute _c1.ancestor(_c2) and compare it to ca, because there | ||||
| # can be multiple common ancestors, e.g. in case of bidmerge. Because our | # can be multiple common ancestors, e.g. in case of bidmerge. Because our | ||||
| # caller may not know if the revision passed in lieu of the CA is a genuine | # caller may not know if the revision passed in lieu of the CA is a genuine | ||||
| # common ancestor or not without explicitly checking it, it's better to | # common ancestor or not without explicitly checking it, it's better to | ||||
| # determine that here. | # determine that here. | ||||
| # | # | ||||