Patchwork upgraderepo: select correct deltareuse depending on actions

login
register
mail settings
Submitter Paul Morelle
Date Jan. 10, 2018, 4:39 p.m.
Message ID <e95cf6b79a9abdc5fc3a.1515602397@taranis.localdomain>
Download mbox | patch
Permalink /patch/26637/
State Accepted
Headers show

Comments

Paul Morelle - Jan. 10, 2018, 4:39 p.m.
# HG changeset patch
# User Paul Morelle <paul.morelle@octobus.net>
# Date 1515601465 -3600
#      Wed Jan 10 17:24:25 2018 +0100
# Node ID e95cf6b79a9abdc5fc3a071cb82f5cabe0b117f3
# Parent  ebf14075a5c113f4fea6e89a4394d8c8fc9e6935
# EXP-Topic upgrade-deltareuse
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r e95cf6b79a9a
upgraderepo: select correct deltareuse depending on actions

Only 'redeltafulladd' was taken into account because of a small typo.
Augie Fackler - Jan. 10, 2018, 11:06 p.m.
On Wed, Jan 10, 2018 at 05:39:57PM +0100, Paul Morelle wrote:
> # HG changeset patch
> # User Paul Morelle <paul.morelle@octobus.net>
> # Date 1515601465 -3600
> #      Wed Jan 10 17:24:25 2018 +0100
> # Node ID e95cf6b79a9abdc5fc3a071cb82f5cabe0b117f3
> # Parent  ebf14075a5c113f4fea6e89a4394d8c8fc9e6935
> # EXP-Topic upgrade-deltareuse
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r e95cf6b79a9a
> upgraderepo: select correct deltareuse depending on actions

queued, thanks

Patch

diff -r ebf14075a5c1 -r e95cf6b79a9a mercurial/upgrade.py
--- a/mercurial/upgrade.py	Sun Jan 07 15:21:16 2018 -0500
+++ b/mercurial/upgrade.py	Wed Jan 10 17:24:25 2018 +0100
@@ -631,7 +631,7 @@ 
         deltareuse = revlog.revlog.DELTAREUSESAMEREVS
     elif 'redeltamultibase' in actions:
         deltareuse = revlog.revlog.DELTAREUSESAMEREVS
-    if 'redeltafulladd' in actions:
+    elif 'redeltafulladd' in actions:
         deltareuse = revlog.revlog.DELTAREUSEFULLADD
     else:
         deltareuse = revlog.revlog.DELTAREUSEALWAYS