Mercurial > public > mercurial-scm > hg
comparison mercurial/upgrade.py @ 45735:edf4fa06df94
upgrade: allow sidedata upgrade to modify revision flag
In the process, we fix the lack of HAS_COPIES_INFO flag on upgrade, and test the
results.
Differential Revision: https://phab.mercurial-scm.org/D9199
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 13 Oct 2020 05:14:37 +0200 |
parents | d1c10d33a85c |
children | fe7d7917ceb5 |
comparison
equal
deleted
inserted
replaced
45734:53c265a6fc83 | 45735:edf4fa06df94 |
---|---|
730 if requirements.SIDEDATA_REQUIREMENT in removedreqs: | 730 if requirements.SIDEDATA_REQUIREMENT in removedreqs: |
731 | 731 |
732 def sidedatacompanion(rl, rev): | 732 def sidedatacompanion(rl, rev): |
733 rl = getattr(rl, '_revlog', rl) | 733 rl = getattr(rl, '_revlog', rl) |
734 if rl.flags(rev) & revlog.REVIDX_SIDEDATA: | 734 if rl.flags(rev) & revlog.REVIDX_SIDEDATA: |
735 return True, (), {} | 735 return True, (), {}, 0, 0 |
736 return False, (), {} | 736 return False, (), {}, 0, 0 |
737 | 737 |
738 elif requirements.COPIESSDC_REQUIREMENT in addedreqs: | 738 elif requirements.COPIESSDC_REQUIREMENT in addedreqs: |
739 sidedatacompanion = metadata.getsidedataadder(srcrepo, dstrepo) | 739 sidedatacompanion = metadata.getsidedataadder(srcrepo, dstrepo) |
740 elif requirements.COPIESSDC_REQUIREMENT in removedreqs: | 740 elif requirements.COPIESSDC_REQUIREMENT in removedreqs: |
741 sidedatacompanion = metadata.getsidedataremover(srcrepo, dstrepo) | 741 sidedatacompanion = metadata.getsidedataremover(srcrepo, dstrepo) |