comparison mercurial/copies.py @ 42226:a6be3af3a397

copies: ignore heuristics copytracing when using changeset-centric algos Differential Revision: https://phab.mercurial-scm.org/D6269
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 17 Apr 2019 14:44:18 -0700
parents d8ca7b99fc51
children d1c2688eda80
comparison
equal deleted inserted replaced
42225:d8ca7b99fc51 42226:a6be3af3a397
413 if stringutil.parsebool(copytracing) is False: 413 if stringutil.parsebool(copytracing) is False:
414 # stringutil.parsebool() returns None when it is unable to parse the 414 # stringutil.parsebool() returns None when it is unable to parse the
415 # value, so we should rely on making sure copytracing is on such cases 415 # value, so we should rely on making sure copytracing is on such cases
416 return {}, {}, {}, {}, {} 416 return {}, {}, {}, {}, {}
417 417
418 if usechangesetcentricalgo(repo):
419 # The heuristics don't make sense when we need changeset-centric algos
420 return _fullcopytracing(repo, c1, c2, base)
421
418 # Copy trace disabling is explicitly below the node == p1 logic above 422 # Copy trace disabling is explicitly below the node == p1 logic above
419 # because the logic above is required for a simple copy to be kept across a 423 # because the logic above is required for a simple copy to be kept across a
420 # rebase. 424 # rebase.
421 if copytracing == 'heuristics': 425 if copytracing == 'heuristics':
422 # Do full copytracing if only non-public revisions are involved as 426 # Do full copytracing if only non-public revisions are involved as