Patchwork [1,of,2,FOLLOW-UP] sparse-revlog: use `span` variable as intended

login
register
mail settings
Submitter Boris Feld
Date Nov. 16, 2018, 6:22 p.m.
Message ID <7f510ce447f6e16ba197.1542392520@localhost.localdomain>
Download mbox | patch
Permalink /patch/36627/
State Accepted
Headers show

Comments

Boris Feld - Nov. 16, 2018, 6:22 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1542290111 -3600
#      Thu Nov 15 14:55:11 2018 +0100
# Node ID 7f510ce447f6e16ba1970606615fcb78946d7146
# Parent  f83cea7f54d7c8c47ad739d1225e5fc3918b542c
# EXP-Topic follow-up-revlog
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 7f510ce447f6
sparse-revlog: use `span` variable as intended

The variable was planned to be used in the while condition but was not used
yet.
Pulkit Goyal - Nov. 16, 2018, 6:48 p.m.
On Fri, Nov 16, 2018 at 11:53 PM Boris Feld <boris.feld@octobus.net> wrote:

> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1542290111 -3600
> #      Thu Nov 15 14:55:11 2018 +0100
> # Node ID 7f510ce447f6e16ba1970606615fcb78946d7146
> # Parent  f83cea7f54d7c8c47ad739d1225e5fc3918b542c
> # EXP-Topic follow-up-revlog
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
> 7f510ce447f6
> sparse-revlog: use `span` variable as intended
>
> The variable was planned to be used in the while condition but was not used
> yet.
>

Queued this one, many thanks!

Patch

diff --git a/mercurial/revlogutils/deltas.py b/mercurial/revlogutils/deltas.py
--- a/mercurial/revlogutils/deltas.py
+++ b/mercurial/revlogutils/deltas.py
@@ -264,7 +264,7 @@  def _slicechunktosize(revlog, revs, targ
             break # protect against individual chunk larger than limit
         localenddata = revlog.end(revs[endrevidx - 1])
         span = localenddata - startdata
-        while (localenddata - startdata) > targetsize:
+        while span > targetsize:
             if endrevidx - startrevidx <= 1:
                 break # protect against individual chunk larger than limit
             endrevidx -= (endrevidx - startrevidx) // 2