Mercurial > public > mercurial-scm > hg-stable

diff mercurial/upgrade.py @ 38736:93777d16a25d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/upgrade.py	Thu Jul 19 09:57:42 2018 +0200
+++ b/mercurial/upgrade.py	Thu Jul 19 10:06:58 2018 +0200
@@ -455,7 +455,7 @@
         #reverse of "/".join(("data", path + ".i"))
         return filelog.filelog(repo.svfs, path[5:-2])
 
-def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, aggressivemergedeltas):
+def _copyrevlogs(ui, srcrepo, dstrepo, tr, deltareuse, deltabothparents):
     """Copy revlogs between 2 repos."""
     revcount = 0
     srcsize = 0
@@ -579,7 +579,7 @@
         ui.note(_('cloning %d revisions from %s\n') % (len(oldrl), unencoded))
         oldrl.clone(tr, newrl, addrevisioncb=oncopiedrevision,
                     deltareuse=deltareuse,
-                    aggressivemergedeltas=aggressivemergedeltas)
+                    deltabothparents=deltabothparents)
 
         datasize = 0
         idx = newrl.index