comparison mercurial/wireprotov1server.py @ 50683:a41eeb877d07

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 18 Jun 2023 00:09:39 +0200
parents 7b723217d368
children 2aaabd8f4471
comparison
equal deleted inserted replaced
50682:b9a355763e76 50683:a41eeb877d07
435 435
436 manifest = repo.vfs.tryread(b'pullbundles.manifest') 436 manifest = repo.vfs.tryread(b'pullbundles.manifest')
437 if not manifest: 437 if not manifest:
438 return None 438 return None
439 res = bundlecaches.parseclonebundlesmanifest(repo, manifest) 439 res = bundlecaches.parseclonebundlesmanifest(repo, manifest)
440 res = bundlecaches.filterclonebundleentries(repo, res) 440 res = bundlecaches.filterclonebundleentries(repo, res, pullbundles=True)
441 if not res: 441 if not res:
442 return None 442 return None
443 cl = repo.unfiltered().changelog 443 cl = repo.unfiltered().changelog
444 heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True) 444 heads_anc = cl.ancestors([cl.rev(rev) for rev in heads], inclusive=True)
445 common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True) 445 common_anc = cl.ancestors([cl.rev(rev) for rev in common], inclusive=True)