[PATCH 3 of 6 v6] transplant: convert applied() algorithm from nodes to revs

Joshua Redstone joshua.redstone at fb.com
Tue Jun 19 15:26:50 CDT 2012


resent as v8:  http://article.gmane.org/gmane.comp.version-control.mercurial.devel/51681

From: Joshua Redstone <joshua.redstone at fb.com<mailto:joshua.redstone at fb.com>>
Date: Friday, June 15, 2012 12:07 PM
To: Bryan O'Sullivan <bos at serpentine.com<mailto:bos at serpentine.com>>
Cc: "mpm at selenic.com<mailto:mpm at selenic.com>" <mpm at selenic.com<mailto:mpm at selenic.com>>, "mercurial-devel at selenic.com<mailto:mercurial-devel at selenic.com>" <mercurial-devel at selenic.com<mailto:mercurial-devel at selenic.com>>
Subject: Re: [PATCH 3 of 6 v6] transplant: convert applied() algorithm from nodes to revs

Hmm,  that diff missing the trailing ':' does not correspond to what I have in my repo for that changeset.  I'm not sure where the discrepancy came from.  Will resend once I address your other feedback.
Josh

From: Bryan O'Sullivan <bos at serpentine.com<mailto:bos at serpentine.com>>
Date: Thursday, June 14, 2012 7:13 PM
To: Joshua Redstone <joshua.redstone at fb.com<mailto:joshua.redstone at fb.com>>
Cc: "mpm at selenic.com<mailto:mpm at selenic.com>" <mpm at selenic.com<mailto:mpm at selenic.com>>, "mercurial-devel at selenic.com<mailto:mercurial-devel at selenic.com>" <mercurial-devel at selenic.com<mailto:mercurial-devel at selenic.com>>
Subject: Re: [PATCH 3 of 6 v6] transplant: convert applied() algorithm from nodes to revs

On Fri, Jun 8, 2012 at 2:27 PM, Joshua Redstone <joshua.redstone at fb.com<mailto:joshua.redstone at fb.com>> wrote:

--- a/hgext/transplant.py       Fri Jun 08 08:39:44 2012 -0700<tel:2012%20-0700>
+++ b/hgext/transplant.py       Fri Jun 08 14:21:32 2012 -0700<tel:2012%20-0700>
-            reachablerevs = repo.changelog.incancestors(
-                [repo.changelog.rev(parent)],
-                stoprev=repo.changelog.rev(t.lnode))
-            reachable = (repo.changelog.node(rev) for rev in reachablerevs)
-            if t.lnode in reachable:
+            lnoderev = repo.changelog.rev(t.lnode)
+            if lnoderev in repo.changelog.incancestors([parentrev], lnoderev)
                return True

The last added line here contains a syntax error.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120619/6a5e6edb/attachment.html>


More information about the Mercurial-devel mailing list