<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<br>
<div class="moz-cite-prefix">On 22/05/18 01:12, Gregory Szorc wrote:<br>
</div>
<blockquote type="cite"
cite="mid:CAKQoGakjAj+5znPiC=PKAJ=SRwi9a-K5knjNRxG0dEj2pRsbFg@mail.gmail.com">
<div dir="ltr">
<div class="gmail_extra">
<div class="gmail_quote">On Mon, May 21, 2018 at 2:47 PM, Paul
Morelle <span dir="ltr"><<a
href="mailto:paul.morelle@octobus.net" target="_blank"
moz-do-not-send="true">paul.morelle@octobus.net</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex"># HG
changeset patch<br>
# User Paul Morelle <<a
href="mailto:paul.morelle@octobus.net"
moz-do-not-send="true">paul.morelle@octobus.net</a>><br>
# Date 1525438855 -7200<br>
# Fri May 04 15:00:55 2018 +0200<br>
# Node ID 054469518b3480201e7f8ada169570<wbr>27009e9f64<br>
# Parent 514605777244de61b68c7e1503c4f1<wbr>06773913f4<br>
# EXP-Topic semi-snapshots<br>
# Available At <a
href="https://bitbucket.org/octobus/mercurial-devel/"
rel="noreferrer" target="_blank" moz-do-not-send="true">https://bitbucket.org/octobus/<wbr>mercurial-devel/</a><br>
# hg pull <a
href="https://bitbucket.org/octobus/mercurial-devel/"
rel="noreferrer" target="_blank" moz-do-not-send="true">https://bitbucket.org/octobus/<wbr>mercurial-devel/</a>
-r 054469518b34<br>
revlog: in _getcandidaterevs, shorten revlog._generaldelta
to gdelta<br>
</blockquote>
<div><br>
</div>
<div>Queued parts 1-4. Thanks.</div>
<div><br>
</div>
<div>Part 5 failed to apply cleanly. Could you please rebase
and resend?<br>
</div>
</div>
</div>
</div>
</blockquote>
Sure!<br>
<br>
However, I am not certain that I have done this properly, as [PATCH
5 of 6] and [PATCH 6 of 6] were sent as [PATCH 1 of 2 V2] and [PATCH
2 of 2 V2].<br>
Is it correct even if the numbers don't match?<br>
<br>
Thanks,<br>
<br>
Paul<br>
<blockquote type="cite"
cite="mid:CAKQoGakjAj+5znPiC=PKAJ=SRwi9a-K5knjNRxG0dEj2pRsbFg@mail.gmail.com">
<div dir="ltr">
<div class="gmail_extra">
<div class="gmail_quote">
<div> </div>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
diff -r 514605777244 -r 054469518b34 mercurial/revlog.py<br>
--- a/mercurial/revlog.py Fri May 11 23:28:02 2018
-0700<br>
+++ b/mercurial/revlog.py Fri May 04 15:00:55 2018
+0200<br>
@@ -305,6 +305,7 @@<br>
grouped by level of easiness.<br>
"""<br>
revlog = self.revlog<br>
+ gdelta = revlog._generaldelta<br>
curr = len(revlog)<br>
prev = curr - 1<br>
p1r, p2r = revlog.rev(p1), revlog.rev(p2)<br>
@@ -316,13 +317,13 @@<br>
# changegroup data into a generaldelta repo.
The only time it<br>
# isn't true is if this is the first revision
in a delta chain<br>
# or if ``format.generaldelta=true`` disabled
``lazydeltabase``.<br>
- if cachedelta and revlog._generaldelta and
revlog._lazydeltabase:<br>
+ if cachedelta and gdelta and
revlog._lazydeltabase:<br>
# Assume what we received from the server
is a good choice<br>
# build delta will reuse the cache<br>
yield (cachedelta[0],)<br>
tested.add(cachedelta[0])<br>
<br>
- if revlog._generaldelta:<br>
+ if gdelta:<br>
# exclude already lazy tested base if any<br>
parents = [p for p in (p1r, p2r)<br>
if p != nullrev and p not in
tested]<br>
______________________________<wbr>_________________<br>
Mercurial-devel mailing list<br>
<a href="mailto:Mercurial-devel@mercurial-scm.org"
moz-do-not-send="true">Mercurial-devel@mercurial-scm.<wbr>org</a><br>
<a
href="https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel"
rel="noreferrer" target="_blank" moz-do-not-send="true">https://www.mercurial-scm.org/<wbr>mailman/listinfo/mercurial-<wbr>devel</a><br>
</blockquote>
</div>
<br>
</div>
</div>
</blockquote>
<br>
</body>
</html>