Patchwork [2,of,2,STABLE] sparse-revlog: unconditionally enables general delta

login
register
mail settings
Submitter Boris Feld
Date July 30, 2018, 2:21 p.m.
Message ID <ea0704e5b98147dc9af5.1532960483@FB-lair>
Download mbox | patch
Permalink /patch/32970/
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 1532958737 -7200
#      Mon Jul 30 15:52:17 2018 +0200
# Branch stable
# Node ID ea0704e5b98147dc9af5c9cfeadb8b20b5cf00b2
# Parent  7f3c63990b6160517a70b896bb9499d1daea2ded
# EXP-Topic sparse-revlog
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r ea0704e5b981
sparse-revlog: unconditionally enables general delta

This come as an extra security, better safe than sorry.
Augie Fackler - July 31, 2018, 1:54 p.m.
> On Jul 30, 2018, at 10:21, Boris Feld <boris.feld@octobus.net> wrote:
> 
> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1532958737 -7200
> #      Mon Jul 30 15:52:17 2018 +0200
> # Branch stable
> # Node ID ea0704e5b98147dc9af5c9cfeadb8b20b5cf00b2
> # Parent  7f3c63990b6160517a70b896bb9499d1daea2ded
> # EXP-Topic sparse-revlog
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r ea0704e5b981
> sparse-revlog: unconditionally enables general delta

Queued these, thanks.

(Side note, not just for you: I'm a little disappointed in the number of last-minute patches we're seeing this RC cycle - it's making me wonder what we can do to try and not get complicated features squeaking into a release just before the freeze cut.)

Patch

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -689,6 +689,8 @@  class localrepository(object):
         self.svfs.options['sparse-read-min-gap-size'] = srmingapsize
         sparserevlog = SPARSEREVLOG_REQUIREMENT in self.requirements
         self.svfs.options['sparse-revlog'] = sparserevlog
+        if sparserevlog:
+            self.svfs.options['generaldelta'] = True
 
         for r in self.requirements:
             if r.startswith('exp-compression-'):