comparison mercurial/exchange.py @ 43562:a49b2e253035

index: use `index.rev` in `exchange.fallbackheads` Differential Revision: https://phab.mercurial-scm.org/D7345
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 09 Nov 2019 13:23:53 +0100
parents 9c1f4e2f1fc4
children 4d8a4ecbb8b9
comparison
equal deleted inserted replaced
43561:45d123d84011 43562:a49b2e253035
526 # missing = ((commonheads::missingheads) - commonheads) 526 # missing = ((commonheads::missingheads) - commonheads)
527 # 527 #
528 # We can pick: 528 # We can pick:
529 # * missingheads part of common (::commonheads) 529 # * missingheads part of common (::commonheads)
530 common = self.outgoing.common 530 common = self.outgoing.common
531 nm = self.repo.changelog.nodemap 531 rev = self.repo.changelog.index.rev
532 cheads = [node for node in self.revs if nm[node] in common] 532 cheads = [node for node in self.revs if rev(node) in common]
533 # and 533 # and
534 # * commonheads parents on missing 534 # * commonheads parents on missing
535 revset = unfi.set( 535 revset = unfi.set(
536 b'%ln and parents(roots(%ln))', 536 b'%ln and parents(roots(%ln))',
537 self.outgoing.commonheads, 537 self.outgoing.commonheads,