| hg-reviewers |
Just a little refactoring to make the next patch simpler.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| pathutil, | pathutil, | ||||
| scmutil, | scmutil, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from .utils import ( | from .utils import ( | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| def _findlimit(repo, a, b): | def _findlimit(repo, ctxa, ctxb): | ||||
| """ | """ | ||||
| Find the last revision that needs to be checked to ensure that a full | Find the last revision that needs to be checked to ensure that a full | ||||
| transitive closure for file copies can be properly calculated. | transitive closure for file copies can be properly calculated. | ||||
| Generally, this means finding the earliest revision number that's an | Generally, this means finding the earliest revision number that's an | ||||
| ancestor of a or b but not both, except when a or b is a direct descendent | ancestor of a or b but not both, except when a or b is a direct descendent | ||||
| of the other, in which case we can return the minimum revnum of a and b. | of the other, in which case we can return the minimum revnum of a and b. | ||||
| """ | """ | ||||
| # basic idea: | # basic idea: | ||||
| # - mark a and b with different sides | # - mark a and b with different sides | ||||
| # - if a parent's children are all on the same side, the parent is | # - if a parent's children are all on the same side, the parent is | ||||
| # on that side, otherwise it is on no side | # on that side, otherwise it is on no side | ||||
| # - walk the graph in topological order with the help of a heap; | # - walk the graph in topological order with the help of a heap; | ||||
| # - add unseen parents to side map | # - add unseen parents to side map | ||||
| # - clear side of any parent that has children on different sides | # - clear side of any parent that has children on different sides | ||||
| # - track number of interesting revs that might still be on a side | # - track number of interesting revs that might still be on a side | ||||
| # - track the lowest interesting rev seen | # - track the lowest interesting rev seen | ||||
| # - quit when interesting revs is zero | # - quit when interesting revs is zero | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| a = ctxa.rev() | |||||
| b = ctxb.rev() | |||||
| if a is None: | if a is None: | ||||
| a = node.wdirrev | a = node.wdirrev | ||||
| if b is None: | if b is None: | ||||
| b = node.wdirrev | b = node.wdirrev | ||||
| side = {a: -1, b: 1} | side = {a: -1, b: 1} | ||||
| visit = [-a, -b] | visit = [-a, -b] | ||||
| heapq.heapify(visit) | heapq.heapify(visit) | ||||
| # files might have to be traced back to the fctx parent of the last | # files might have to be traced back to the fctx parent of the last | ||||
| # one-side-only changeset, but not further back than that | # one-side-only changeset, but not further back than that | ||||
| repo = a._repo | repo = a._repo | ||||
| debug = repo.ui.debugflag and repo.ui.configbool('devel', 'debug.copies') | debug = repo.ui.debugflag and repo.ui.configbool('devel', 'debug.copies') | ||||
| dbg = repo.ui.debug | dbg = repo.ui.debug | ||||
| if debug: | if debug: | ||||
| dbg('debug.copies: looking into rename from %s to %s\n' | dbg('debug.copies: looking into rename from %s to %s\n' | ||||
| % (a, b)) | % (a, b)) | ||||
| limit = _findlimit(repo, a.rev(), b.rev()) | limit = _findlimit(repo, a, b) | ||||
| if debug: | if debug: | ||||
| dbg('debug.copies: search limit: %d\n' % limit) | dbg('debug.copies: search limit: %d\n' % limit) | ||||
| am = a.manifest() | am = a.manifest() | ||||
| # find where new files came from | # find where new files came from | ||||
| # we currently don't try to find where old files went, too expensive | # we currently don't try to find where old files went, too expensive | ||||
| # this means we can miss a case like 'hg rm b; hg cp a b' | # this means we can miss a case like 'hg rm b; hg cp a b' | ||||
| cm = {} | cm = {} | ||||
| # keep track of which endpoint is dirty | # keep track of which endpoint is dirty | ||||
| dirtyc1 = not base.isancestorof(_c1) | dirtyc1 = not base.isancestorof(_c1) | ||||
| dirtyc2 = not base.isancestorof(_c2) | dirtyc2 = not base.isancestorof(_c2) | ||||
| graft = dirtyc1 or dirtyc2 | graft = dirtyc1 or dirtyc2 | ||||
| tca = base | tca = base | ||||
| if graft: | if graft: | ||||
| tca = _c1.ancestor(_c2) | tca = _c1.ancestor(_c2) | ||||
| limit = _findlimit(repo, c1.rev(), c2.rev()) | limit = _findlimit(repo, c1, c2) | ||||
| repo.ui.debug(" searching for copies back to rev %d\n" % limit) | repo.ui.debug(" searching for copies back to rev %d\n" % limit) | ||||
| m1 = c1.manifest() | m1 = c1.manifest() | ||||
| m2 = c2.manifest() | m2 = c2.manifest() | ||||
| mb = base.manifest() | mb = base.manifest() | ||||
| # gather data from _checkcopies: | # gather data from _checkcopies: | ||||
| # - diverge = record all diverges in this dict | # - diverge = record all diverges in this dict | ||||