Mercurial > hg

comparison mercurial/upgrade.py @ 40837:64051af15596

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade: clarify "aggressivemergedelta" handling We rename "aggressivemergedelta" argument to "forceaggressivemergedelta". The previous argument naming could infer an absolute control on the behavior. However, the code show we respect the config option if set.
author Boris Feld <boris.feld@octobus.net>
date Fri, 13 Jul 2018 11:45:15 +0200
parents dbcb466d0065
children 3764330f76a6
comparison
equal deleted inserted replaced
40836:5887973febc7 40837:64051af15596
454 return manifest.manifestrevlog(repo.svfs, tree=mandir) 454 return manifest.manifestrevlog(repo.svfs, tree=mandir)
455 else: 455 else:
456 #reverse of "/".join(("data", path + ".i")) 456 #reverse of "/".join(("data", path + ".i"))
457 return filelog.filelog(repo.svfs, path[5:-2]) 457 return filelog.filelog(repo.svfs, path[5:-2])
458 458
459 def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents): 459 def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, forcedeltabothparents):
460 """Copy revlogs between 2 repos.""" 460 """Copy revlogs between 2 repos."""
461 revcount = 0 461 revcount = 0
462 srcsize = 0 462 srcsize = 0
463 srcrawsize = 0 463 srcrawsize = 0
464 dstsize = 0 464 dstsize = 0
576 576
577 577
578 ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) 578 ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded))
579 oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision, 579 oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision,
580 deltareuse=deltareuse, 580 deltareuse=deltareuse,
581 deltabothparents=deltabothparents) 581 forcedeltabothparents=forcedeltabothparents)
582 582
583 info = newrl.storageinfo(storedsize=True) 583 info = newrl.storageinfo(storedsize=True)
584 datasize = info['storedsize'] or 0 584 datasize = info['storedsize'] or 0
585 585
586 dstsize += datasize 586 dstsize += datasize