Submitter | Pulkit Goyal |
---|---|
Date | May 22, 2017, 8:52 p.m. |
Message ID | <7cb5bf075d4aa046f7b3.1495486334@workspace> |
Download | mbox | patch |
Permalink | /patch/20845/ |
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 1918B2C216; Mon, 22 May 2017 16:52:57 -0400 (EDT) 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 vXxRbq_7GhHF; Mon, 22 May 2017 16:52:56 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id BF4052C270; Mon, 22 May 2017 16:52:54 -0400 (EDT) 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 92BF02C26F for <mercurial-devel@mercurial-scm.org>; Mon, 22 May 2017 16:52:52 -0400 (EDT) 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 BT-qqVMxanSW for <mercurial-devel@mercurial-scm.org>; Mon, 22 May 2017 16:52:52 -0400 (EDT) Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) by mercurial-scm.org (Postfix) with ESMTPS id 933982C213 for <mercurial-devel@mercurial-scm.org>; Mon, 22 May 2017 16:52:50 -0400 (EDT) Received: by mail-pf0-x243.google.com with SMTP id f27so22389030pfe.0 for <mercurial-devel@mercurial-scm.org>; Mon, 22 May 2017 13:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:content-transfer-encoding:subject:message-id :in-reply-to:references:user-agent:date:from:to; bh=WAHruR1LmD3oQdxQNCAKBLG+6gHrLCxTGYd9pigUwDM=; b=mqzyMAmMdKfjxHAOLeZqhcWcBHIxri/UHaYT3fPOVHYbBUBQRH1KSJHgsZCONIqMvd 26VbYVzhONR2yrq1GWKkCtJdM4zV2hLXBUdmNNDCl0+EwnfdAlPig1IWRO21JzX4bxhp 4iGpDePbv+tvQEMKZSzLNyAQq43bJ0HiaTKddBAPbWz+LXYemTvz0NFs5moEUlGB8oz/ 7vjW1NIqil16C2ANAeaVKHn3EW5/OJTmLeImUW4E2IaCPqhiY7tX1ZwYvCtGPkjlP5vD jSLr7dLaFDRWQ1cOLL57/TxxUv2jjI2mxNtjPUHfhQWqRUQm2pQ3s/Cc3z28P/auGjX1 coWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:content-transfer-encoding:subject :message-id:in-reply-to:references:user-agent:date:from:to; bh=WAHruR1LmD3oQdxQNCAKBLG+6gHrLCxTGYd9pigUwDM=; b=YMzMVO5NF1vr1Dhilz1nvn4euuvtEABoxZYNBJLLrIWrmlT2E/xI1KWLw+W/f5q/dN 6AsXTkBdR8CvBgHYDcD1C0MarfjSaS3k594yv2Z1N39dJQKv40TtVvZPTGVY3RkJff1W IkhKVbg6Vn4TpIKpHdHVcPHuXpOZc1UJS/4cnKiane8O05GR8PWHeJcde0DE7ggUucuB uACq2CCvurhNq9ObGBVa/HLdkEB8yP1c1yMUbsHyhmSVOJkv+pyPKdmhCLZI2S2WOOFr hkT1iy8Ep54RPEHt6JJGT8ZG3ovWV0Vgxr2D6MbE7OZ04+AzfLVBJzgLDP2bKmXi+Iod BaXw== X-Gm-Message-State: AODbwcDkbiiATQ1K1I/HUL4aFCW3KPMU/shZ1MszVCp/XdMP55BDMLbI QouBMJQ2q+qkWwCTnqk= X-Received: by 10.98.11.205 with SMTP id 74mr27985236pfl.214.1495486369837; Mon, 22 May 2017 13:52:49 -0700 (PDT) Received: from [127.0.1.1] ([171.48.76.34]) by smtp.gmail.com with ESMTPSA id v45sm36217279pgn.56.2017.05.22.13.52.48 for <mercurial-devel@mercurial-scm.org> (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 13:52:49 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 04 of 10] revset: remove redundant condition and change to else from elif X-Mercurial-Node: 7cb5bf075d4aa046f7b39149c720d63253d510d6 X-Mercurial-Series-Index: 4 X-Mercurial-Series-Total: 10 Message-Id: <7cb5bf075d4aa046f7b3.1495486334@workspace> X-Mercurial-Series-Id: <4f81eb36137f66f8ce2a.1495486331@workspace> In-Reply-To: <4f81eb36137f66f8ce2a.1495486331@workspace> References: <4f81eb36137f66f8ce2a.1495486331@workspace> User-Agent: Mercurial-patchbomb/4.2+12-a0e46f6b248b Date: Tue, 23 May 2017 02:22:14 +0530 From: Pulkit Goyal <7895pulkit@gmail.com> 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
Pulkit Goyal - May 22, 2017, 8:52 p.m.
Patch
diff --git a/mercurial/revset.py b/mercurial/revset.py --- a/mercurial/revset.py +++ b/mercurial/revset.py @@ -1506,7 +1506,7 @@ ps.add(cl.parentrevs(r)[0]) except error.WdirUnsupported: ps.add(repo[r].parents()[0].rev()) - elif n == 2: + else: try: parents = cl.parentrevs(r) if parents[1] != node.nullrev: