Patchwork [1,of,2,STABLE] sparse-revlog: also use sparse-revlog config as a general delta trigger

login
register
mail settings
Submitter Boris Feld
Date July 30, 2018, 2:21 p.m.
Message ID <7f3c63990b6160517a70.1532960482@FB-lair>
Download mbox | patch
Permalink /patch/32969/
State Accepted
Headers show

Comments

Boris Feld - July 30, 2018, 2:21 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1532958827 -7200
#      Mon Jul 30 15:53:47 2018 +0200
# Branch stable
# Node ID 7f3c63990b6160517a70b896bb9499d1daea2ded
# Parent  ae17555ef93fc95d800b46ccab865ea93f9951ca
# EXP-Topic sparse-revlog
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 7f3c63990b61
sparse-revlog: also use sparse-revlog config as a general delta trigger

Sparse revlog rely on general delta, so we should make sure it is used.

Patch

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1366,7 +1366,8 @@  def gdinitconfig(ui):
     """
     # experimental config: format.generaldelta
     return (ui.configbool('format', 'generaldelta')
-            or ui.configbool('format', 'usegeneraldelta'))
+            or ui.configbool('format', 'usegeneraldelta')
+            or ui.configbool('format', 'sparse-revlog'))
 
 def gddeltaconfig(ui):
     """helper function to know if incoming delta should be optimised