# HG changeset patch # User Pierre-Yves David # Date 2019-07-27 17:25:47 # Node ID 095dcdd0d55c90e0631d7c0afe59eb1e14f3cb52 # Parent 896fb9deeaf8c21a728dbe64e808c07b27e5b168 upgrade: rename `_copyrevlogs` to `_clonerevlogs` The underlying revlog method is named `clone`, keeping the naming consistent seems clearer. This is motivated to clarify the difference with an (upcoming) function that simply copy revlog files as is. diff --git a/mercurial/upgrade.py b/mercurial/upgrade.py --- a/mercurial/upgrade.py +++ b/mercurial/upgrade.py @@ -533,7 +533,7 @@ def _revlogfrompath(repo, path): #reverse of "/".join(("data", path + ".i")) return filelog.filelog(repo.svfs, path[5:-2]) -def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, forcedeltabothparents): +def _clonerevlogs(ui, srcrepo, dstrepo, tr, deltareuse, forcedeltabothparents): """Copy revlogs between 2 repos.""" revcount = 0 srcsize = 0 @@ -745,7 +745,7 @@ def _upgraderepo(ui, srcrepo, dstrepo, r deltareuse = revlog.revlog.DELTAREUSEALWAYS with dstrepo.transaction('upgrade') as tr: - _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, + _clonerevlogs(ui, srcrepo, dstrepo, tr, deltareuse, 're-delta-multibase' in actions) # Now copy other files in the store directory.