| hg-reviewers |
I want to split up _chainandfilter() more so the call to _filter()
consistently happens at the end of pathcopies(). This prepares for
that change.
| 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 (22 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| def _forwardcopies(a, b, match=None): | def _forwardcopies(a, b, match=None): | ||||
| """find {dst@b: src@a} copy mapping where a is an ancestor of b""" | """find {dst@b: src@a} copy mapping where a is an ancestor of b""" | ||||
| match = a.repo().narrowmatch(match) | match = a.repo().narrowmatch(match) | ||||
| # check for working copy | # check for working copy | ||||
| if b.rev() is None: | if b.rev() is None: | ||||
| cm = _committedforwardcopies(a, b.p1(), match) | cm = _committedforwardcopies(a, b.p1(), match) | ||||
| # combine copies from dirstate if necessary | # combine copies from dirstate if necessary | ||||
| return _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match)) | copies = _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match)) | ||||
| return _committedforwardcopies(a, b, match) | else: | ||||
| copies = _committedforwardcopies(a, b, match) | |||||
| return copies | |||||
| def _backwardrenames(a, b, match): | def _backwardrenames(a, b, match): | ||||
| if a._repo.ui.config('experimental', 'copytrace') == 'off': | if a._repo.ui.config('experimental', 'copytrace') == 'off': | ||||
| return {} | return {} | ||||
| # Even though we're not taking copies into account, 1:n rename situations | # Even though we're not taking copies into account, 1:n rename situations | ||||
| # can still exist (e.g. hg cp a b; hg mv a c). In those cases we | # can still exist (e.g. hg cp a b; hg mv a c). In those cases we | ||||
| # arbitrarily pick one of the renames. | # arbitrarily pick one of the renames. | ||||
| return {} | return {} | ||||
| a = y.ancestor(x) | a = y.ancestor(x) | ||||
| if a == x: | if a == x: | ||||
| if debug: | if debug: | ||||
| repo.ui.debug('debug.copies: search mode: forward\n') | repo.ui.debug('debug.copies: search mode: forward\n') | ||||
| if y.rev() is None and x == y.p1(): | if y.rev() is None and x == y.p1(): | ||||
| # short-circuit to avoid issues with merge states | # short-circuit to avoid issues with merge states | ||||
| return _dirstatecopies(repo, match) | return _dirstatecopies(repo, match) | ||||
| return _forwardcopies(x, y, match=match) | copies = _forwardcopies(x, y, match=match) | ||||
| if a == y: | elif a == y: | ||||
| if debug: | if debug: | ||||
| repo.ui.debug('debug.copies: search mode: backward\n') | repo.ui.debug('debug.copies: search mode: backward\n') | ||||
| return _backwardrenames(x, y, match=match) | copies = _backwardrenames(x, y, match=match) | ||||
| else: | |||||
| if debug: | if debug: | ||||
| repo.ui.debug('debug.copies: search mode: combined\n') | repo.ui.debug('debug.copies: search mode: combined\n') | ||||
| return _chainandfilter(x, y, _backwardrenames(x, a, match=match), | copies = _chainandfilter(x, y, _backwardrenames(x, a, match=match), | ||||
| _forwardcopies(a, y, match=match)) | _forwardcopies(a, y, match=match)) | ||||
| return copies | |||||
| def mergecopies(repo, c1, c2, base): | def mergecopies(repo, c1, c2, base): | ||||
| """ | """ | ||||
| Finds moves and copies between context c1 and c2 that are relevant for | Finds moves and copies between context c1 and c2 that are relevant for | ||||
| merging. 'base' will be used as the merge base. | merging. 'base' will be used as the merge base. | ||||
| Copytracing is used in commands like rebase, merge, unshelve, etc to merge | 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. | files that were moved/ copied in one merge parent and modified in another. | ||||