Mercurial > public > mercurial-scm > hg
diff mercurial/upgrade.py @ 40837:64051af15596
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 |
line wrap: on
line diff
--- a/mercurial/upgrade.py Fri Jul 13 02:54:52 2018 +0200 +++ b/mercurial/upgrade.py Fri Jul 13 11:45:15 2018 +0200 @@ -456,7 +456,7 @@ #reverse of "/".join(("data", path + ".i")) return filelog.filelog(repo.svfs, path[5:-2]) -def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents): +def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, forcedeltabothparents): """Copy revlogs between 2 repos.""" revcount = 0 srcsize = 0 @@ -578,7 +578,7 @@ ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded)) oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision, deltareuse=deltareuse, - deltabothparents=deltabothparents) + forcedeltabothparents=forcedeltabothparents) info = newrl.storageinfo(storedsize=True) datasize = info['storedsize'] or 0