Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.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 | aa21a9ad46ea |
| children | 913ca175c4ae |
line wrap: on
line diff
--- a/mercurial/localrepo.py Thu Jul 19 09:57:42 2018 +0200 +++ b/mercurial/localrepo.py Thu Jul 19 10:06:58 2018 +0200 @@ -669,9 +669,9 @@ if manifestcachesize is not None: self.svfs.options['manifestcachesize'] = manifestcachesize # experimental config: format.aggressivemergedeltas - aggressivemergedeltas = self.ui.configbool('format', - 'aggressivemergedeltas') - self.svfs.options['aggressivemergedeltas'] = aggressivemergedeltas + deltabothparents = self.ui.configbool('format', + 'aggressivemergedeltas') + self.svfs.options['deltabothparents'] = deltabothparents self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui) chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan') if 0 <= chainspan: