Submitter | via Mercurial-devel |
---|---|
Date | June 19, 2017, 8:47 p.m. |
Message ID | <8b6444932695a274c93a.1497905279@martinvonz.svl.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/21513/ |
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 CD8472C26E; Mon, 19 Jun 2017 16:48:21 -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 O2ql40qbrq90; Mon, 19 Jun 2017 16:48:21 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 4E6DD2C1CB; Mon, 19 Jun 2017 16:48:21 -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 0BE642C212 for <mercurial-devel@mercurial-scm.org>; Mon, 19 Jun 2017 16:48:20 -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 mgo7H_1gCTvI for <mercurial-devel@mercurial-scm.org>; Mon, 19 Jun 2017 16:48:19 -0400 (EDT) Received: from mail-it0-x255.google.com (mail-it0-x255.google.com [IPv6:2607:f8b0:4001:c0b::255]) by mercurial-scm.org (Postfix) with ESMTPS id C9A2A2C1B8 for <mercurial-devel@mercurial-scm.org>; Mon, 19 Jun 2017 16:48:18 -0400 (EDT) Received: by mail-it0-x255.google.com with SMTP id f20so1188335itb.0 for <mercurial-devel@mercurial-scm.org>; Mon, 19 Jun 2017 13:48:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:content-transfer-encoding:subject:message-id :in-reply-to:references:user-agent:date:from:to; bh=y03uE/YpwNW8DsBxDgqomPotaCyhI/dT8x45C/f3iT0=; b=qmoDTq6fYatbTpePbrnUTZHvKE6cn9A/Pg/99dpP3mV69Qpn90ebFBjG+iaERru8rx WFIv+WN8On0IdnuyQQo/8/XnV4hlM+T9G7EtcIo16ABDKYxL+R49YKUWX5qpKqzVAidS k443+ISNalUn7I5iQ9kdtVj93YcCHFPtY9v7vXDvnr5RlJyBiXK+9t/V5KAS0ybW5Yq4 EUO7YPyC1VH94UHzk5M9mXtxVgNye+FLNhyRl+s1zA0Bn6dkO2CjYQHKmru+34gU27Kr aTm+aOE693ySOFTD5BbGz18dQEIHgmwvdVC2MCbpR0UphW0MOrdGyv4oD4X7GALzrg85 YXYg== 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=y03uE/YpwNW8DsBxDgqomPotaCyhI/dT8x45C/f3iT0=; b=iztf54LwNZSL5CUHiLT1TE/VHzfCfJzL4zNzN3IjXmZhc6MHLjxW9F85MaZSLclXya w//FxxoNPscxB5eLrgrBjHeSTiv9P+A2ZtWnc55gvx2PhJr+0PLuFoAK9o8E6lrC8nEP dlqvkFVgsjjvsGgA0mzXkKmp+38VzCmG4/H9z/Atg31p0Rm6jFvox8oeEg9Lpzqoxkvd d5nFJsHKqXtZL804ytKDX30iHGRm60TQCT643CdjEZ9AMRTeBIBck734HmIFMa/v6EWD 5++sdiut7sMdodlV/D+O03dcoxgiPZTClVNsJNTG9viYDJwyOOv2JmonLgmJbfY9EllD C1CA== X-Gm-Message-State: AKS2vOzZDZUzT9jwMnjQM1Zoal0NPLS5iG4AUKdBgDZbLSfxIXmsWIeb 27/wBRq65q/L2c9jc+pC8cASHn2GGioQ2UMmWKm0LQLYxFIq+b9z49Yl9sX4e+amOsDoDv2zJXV aG5ohvziWeD7dVr2EoxmyaHkAXi/oMhTRGZo5JL4B9L9gmPItkTirKg== X-Received: by 10.36.19.76 with SMTP id 73mr137779itz.1.1497905298198; Mon, 19 Jun 2017 13:48:18 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 7 of 9] strip: remove unncessary "del" and inline variable X-Mercurial-Node: 8b6444932695a274c93a06bc3744f99b849d3fab X-Mercurial-Series-Index: 7 X-Mercurial-Series-Total: 9 Message-Id: <8b6444932695a274c93a.1497905279@martinvonz.svl.corp.google.com> X-Mercurial-Series-Id: <13b76c56433d09394036.1497905273@martinvonz.svl.corp.google.com> In-Reply-To: <13b76c56433d09394036.1497905273@martinvonz.svl.corp.google.com> References: <13b76c56433d09394036.1497905273@martinvonz.svl.corp.google.com> User-Agent: Mercurial-patchbomb/4.2.1+598-48d1e1214d8c Date: Mon, 19 Jun 2017 13:47:59 -0700 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> From: Martin von Zweigbergk via Mercurial-devel <mercurial-devel@mercurial-scm.org> Reply-To: Martin von Zweigbergk <martinvonz@google.com> 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
via Mercurial-devel - June 19, 2017, 8:47 p.m.
Patch
diff --git a/mercurial/repair.py b/mercurial/repair.py --- a/mercurial/repair.py +++ b/mercurial/repair.py @@ -168,9 +168,7 @@ mfst = repo.manifestlog._revlog - curtr = repo.currenttransaction() - if curtr is not None: - del curtr # avoid carrying reference to transaction for nothing + if repo.currenttransaction() is not None: raise error.ProgrammingError('cannot strip from inside a transaction') try: