Submitter | Yuya Nishihara |
---|---|
Date | Dec. 6, 2017, 3:05 p.m. |
Message ID | <1977b7f3214c612d62e0.1512572749@mimosa> |
Download | mbox | patch |
Permalink | /patch/25974/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 292CF2C2DC; Wed, 6 Dec 2017 10:06:15 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id hFctLSunNhVY; Wed, 6 Dec 2017 10:06:14 -0500 (EST) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id B66542C2EE; Wed, 6 Dec 2017 10:06:14 -0500 (EST) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id C32C22C2E6 for <mercurial-devel@mercurial-scm.org>; Wed, 6 Dec 2017 10:06:13 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Mz0jr3V3VZgi for <mercurial-devel@mercurial-scm.org>; Wed, 6 Dec 2017 10:06:13 -0500 (EST) Received: from mail-pg0-x22b.google.com (mail-pg0-x22b.google.com [IPv6:2607:f8b0:400e:c05::22b]) by mercurial-scm.org (Postfix) with ESMTPS id 801822C2ED for <mercurial-devel@mercurial-scm.org>; Wed, 6 Dec 2017 10:06:12 -0500 (EST) Received: by mail-pg0-x22b.google.com with SMTP id f12so2295676pgo.5 for <mercurial-devel@mercurial-scm.org>; Wed, 06 Dec 2017 07:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:mime-version:content-transfer-encoding:subject:message-id :in-reply-to:references:user-agent:date:from:to; bh=UUiYDjiPX0LYfI2qfJ/UACGdXS/e4AzIziq3AuiOqBk=; b=AiITC76M2R1cSNMaz6KHmZ/xPSxT6QpyYVUwL9cGnzJKR4o2Fk6BMcLBwB5k3f/nxj Z7nDWYNXXK8jc8VGz8RVF1trPAxHmaoQ0GkKgwQwmcaAoVSLcRqc6eyvuxgDqNi0GIXr XmIgCimuZNONDPIsOJgZY5Dih+2vvs8dgA4zcjZucz0PbPiqOZD27ZkAGNcXlzzAZIIO 6kI8jvz/9lDELYFT9jAPtN1gO1T/lm91nm2FA9WRVhroto0C2XDkJuyjBUCELiTgy7FQ +Avt1+kTQcvbqjS12U+P8+rmN8dxatKI10/XNOQ+nqj4weXZM4/WYfbLbr96HSGIP5Gc 7bJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:mime-version:content-transfer-encoding :subject:message-id:in-reply-to:references:user-agent:date:from:to; bh=UUiYDjiPX0LYfI2qfJ/UACGdXS/e4AzIziq3AuiOqBk=; b=SbEPoVdpCXs0sjfBimSfVzfOU3X76pvf/a/5PXVHjC+LA2kdlndwDB5vGT8H/FPvpe azZza2TUT9vVwsHBc6PFI38LKPk0rhg2xQ7Prtv0lHAg9nnZe8MQwxCFG6TuUTWXe/5X CQxeZ7TNmFDHGVSpsN1ZcY3MTRPNZUT6XbDEaHvzmulk5/kcbE353GiF894PPd7yFZyY dkLXDv2Hm5R1szkgCjKN35Ii75x7NYnkfjQG5bAIiOiItw2AnQY6Au+lrqwPvxuuERth ItlNTbMRnVRkSFmUqkNAPtZXvCzFgybaRQFMf7Uud4iKgX8bAtBEQ5A68pIsbES/AXvm CtOA== X-Gm-Message-State: AJaThX7w5g+7WpadGgdG6xn1OZ5A7Ek7FUYrwmEVJYY9fLU/hjCUYlHe UALUyheeawAxMPp1HGzmKX9qK0kh X-Google-Smtp-Source: AGs4zMY34lXGiTZo1+2a2pVn2fZRd0Rmu+gB6vBQF7/j9tvtc+yNCSF8+IOqZ38CMDpLGTSvsIXrSw== X-Received: by 10.101.82.203 with SMTP id z11mr21389633pgp.404.1512572771111; Wed, 06 Dec 2017 07:06:11 -0800 (PST) Received: from [127.0.1.1] (p7bc63e36.tkyea126.ap.so-net.ne.jp. [123.198.62.54]) by smtp.gmail.com with ESMTPSA id z23sm4566608pgc.2.2017.12.06.07.06.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Dec 2017 07:06:10 -0800 (PST) MIME-Version: 1.0 Subject: [PATCH 5 of 8] dagop: use fctx.rev() consistently in filectxancestors() X-Mercurial-Node: 1977b7f3214c612d62e099f6984fae086adcc69c X-Mercurial-Series-Index: 5 X-Mercurial-Series-Total: 8 Message-Id: <1977b7f3214c612d62e0.1512572749@mimosa> X-Mercurial-Series-Id: <1bccb52bee2a1c8fee2d.1512572745@mimosa> In-Reply-To: <1bccb52bee2a1c8fee2d.1512572745@mimosa> References: <1bccb52bee2a1c8fee2d.1512572745@mimosa> User-Agent: Mercurial-patchbomb/4.4.2+212-15d38e8fcb1e Date: Thu, 07 Dec 2017 00:05:49 +0900 From: Yuya Nishihara <yuya@tcha.org> To: mercurial-devel@mercurial-scm.org X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Yuya Nishihara - Dec. 6, 2017, 3:05 p.m.
Patch
diff --git a/mercurial/dagop.py b/mercurial/dagop.py --- a/mercurial/dagop.py +++ b/mercurial/dagop.py @@ -87,7 +87,7 @@ def filectxancestors(fctx, followfirst=F yield c while True: for parent in c.parents()[:cut]: - visit[(parent.linkrev(), parent.filenode())] = parent + visit[(parent.rev(), parent.filenode())] = parent if not visit: break c = visit.pop(max(visit))