| hg-reviewers |
I'm going to ignore experimental.copytrace when changeset-centric
algorithms are required. This little refactoring makes that easier to
add.
| 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 (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| narrowmatch = c1.repo().narrowmatch() | narrowmatch = c1.repo().narrowmatch() | ||||
| # 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 _dirstatecopies(repo, narrowmatch), {}, {}, {}, {} | return _dirstatecopies(repo, narrowmatch), {}, {}, {}, {} | ||||
| copytracing = repo.ui.config('experimental', 'copytrace') | copytracing = repo.ui.config('experimental', 'copytrace') | ||||
| boolctrace = stringutil.parsebool(copytracing) | if stringutil.parsebool(copytracing) is False: | ||||
| # stringutil.parsebool() returns None when it is unable to parse the | |||||
| # value, so we should rely on making sure copytracing is on such cases | |||||
| return {}, {}, {}, {}, {} | |||||
| # 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 copytracing == 'heuristics': | if copytracing == 'heuristics': | ||||
| # Do full copytracing if only non-public revisions are involved as | # Do full copytracing if only non-public revisions are involved as | ||||
| # that will be fast enough and will also cover the copies which could | # that will be fast enough and will also cover the copies which could | ||||
| # be missed by heuristics | # be missed by heuristics | ||||
| if _isfullcopytraceable(repo, c1, base): | if _isfullcopytraceable(repo, c1, base): | ||||
| return _fullcopytracing(repo, c1, c2, base) | return _fullcopytracing(repo, c1, c2, base) | ||||
| return _heuristicscopytracing(repo, c1, c2, base) | return _heuristicscopytracing(repo, c1, c2, base) | ||||
| elif boolctrace is False: | |||||
| # stringutil.parsebool() returns None when it is unable to parse the | |||||
| # value, so we should rely on making sure copytracing is on such cases | |||||
| return {}, {}, {}, {}, {} | |||||
| else: | else: | ||||
| return _fullcopytracing(repo, c1, c2, base) | return _fullcopytracing(repo, c1, c2, base) | ||||
| def _isfullcopytraceable(repo, c1, base): | def _isfullcopytraceable(repo, c1, base): | ||||
| """ Checks that if base, source and destination are all no-public branches, | """ Checks that if base, source and destination are all no-public branches, | ||||
| if yes let's use the full copytrace algorithm for increased capabilities | if yes let's use the full copytrace algorithm for increased capabilities | ||||
| since it will be fast enough. | since it will be fast enough. | ||||