Mercurial > hg
comparison mercurial/upgrade.py @ 38736:93777d16a25d
aggressivemergedeltas: rename variable internally
The "aggressivemergedeltas" name is not great. First, it is quite long,
second, we would rather have less "Aggressive" names within the project. We
are about to rename the config option, so it seems the appropriate time to
rename the internal variable.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 19 Jul 2018 10:06:58 +0200 |
parents | d12415b8f833 |
children | 0d97530eb535 |
comparison
equal
deleted
inserted
replaced
38735:8891dc15b327 | 38736:93777d16a25d |
---|---|
453 return manifest.manifestrevlog(repo.svfs, dir=mandir) | 453 return manifest.manifestrevlog(repo.svfs, dir=mandir) |
454 else: | 454 else: |
455 #reverse of "/".join(("data", path + ".i")) | 455 #reverse of "/".join(("data", path + ".i")) |
456 return filelog.filelog(repo.svfs, path[5:-2]) | 456 return filelog.filelog(repo.svfs, path[5:-2]) |
457 | 457 |
458 def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, aggressivemergedeltas): | 458 def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents): |
459 """Copy revlogs between 2 repos.""" | 459 """Copy revlogs between 2 repos.""" |
460 revcount = 0 | 460 revcount = 0 |
461 srcsize = 0 | 461 srcsize = 0 |
462 srcrawsize = 0 | 462 srcrawsize = 0 |
463 dstsize = 0 | 463 dstsize = 0 |
577 | 577 |
578 | 578 |
579 ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) | 579 ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) |
580 oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision, | 580 oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision, |
581 deltareuse=deltareuse, | 581 deltareuse=deltareuse, |
582 aggressivemergedeltas=aggressivemergedeltas) | 582 deltabothparents=deltabothparents) |
583 | 583 |
584 datasize = 0 | 584 datasize = 0 |
585 idx = newrl.index | 585 idx = newrl.index |
586 for rev in newrl: | 586 for rev in newrl: |
587 datasize += idx[rev][1] | 587 datasize += idx[rev][1] |