Show More
@@ -927,7 +927,7 b" coreconfigitem('progress', 'width'," | |||
|
927 | 927 | coreconfigitem('push', 'pushvars.server', |
|
928 | 928 | default=False, |
|
929 | 929 | ) |
|
930 |
coreconfigitem('re |
|
|
930 | coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', | |
|
931 | 931 | default=True, |
|
932 | 932 | alias=[('format', 'aggressivemergedeltas')], |
|
933 | 933 | ) |
@@ -1773,13 +1773,13 b' have a definite end point.' | |||
|
1773 | 1773 | |
|
1774 | 1774 | Alias definitions for revsets. See :hg:`help revsets` for details. |
|
1775 | 1775 | |
|
1776 | ``revlog`` | |
|
1776 | ``storage`` | |
|
1777 | 1777 | ---------- |
|
1778 | 1778 | |
|
1779 | 1779 | Control the strategy Mercurial uses internally to store history. Options in this |
|
1780 | 1780 | category impact performance and repository size. |
|
1781 | 1781 | |
|
1782 | ``optimize-delta-parent-choice`` | |
|
1782 | ``revlog.optimize-delta-parent-choice`` | |
|
1783 | 1783 | When storing a merge revision, both parents will be equally considered as |
|
1784 | 1784 | a possible delta base. This results in better delta selection and improved |
|
1785 | 1785 | revlog compression. This option is enabled by default. |
@@ -668,8 +668,8 b' class localrepository(object):' | |||
|
668 | 668 | manifestcachesize = self.ui.configint('format', 'manifestcachesize') |
|
669 | 669 | if manifestcachesize is not None: |
|
670 | 670 | self.svfs.options['manifestcachesize'] = manifestcachesize |
|
671 |
deltabothparents = self.ui.configbool('re |
|
|
672 |
|
|
|
671 | deltabothparents = self.ui.configbool('storage', | |
|
672 | 'revlog.optimize-delta-parent-choice') | |
|
673 | 673 | self.svfs.options['deltabothparents'] = deltabothparents |
|
674 | 674 | self.svfs.options['lazydeltabase'] = not scmutil.gddeltaconfig(self.ui) |
|
675 | 675 | chainspan = self.ui.configbytes('experimental', 'maxdeltachainspan') |
@@ -146,7 +146,7 b' Test revlog.optimize-delta-parent-choice' | |||
|
146 | 146 | - Verify aggressive merge uses p2 (commit 0) as delta parent |
|
147 | 147 | $ hg up -q -C 1 |
|
148 | 148 | $ hg merge -q 0 |
|
149 | $ hg commit -q -m merge --config revlog.optimize-delta-parent-choice=yes | |
|
149 | $ hg commit -q -m merge --config storage.revlog.optimize-delta-parent-choice=yes | |
|
150 | 150 | $ hg debugdeltachain -m |
|
151 | 151 | rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio |
|
152 | 152 | 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000 |
General Comments 0
You need to be logged in to leave comments.
Login now