Submitter | Yuya Nishihara |
---|---|
Date | May 28, 2017, 3:26 p.m. |
Message ID | <cad7aca56f0bf3d5865c.1495985168@mimosa> |
Download | mbox | patch |
Permalink | /patch/20984/ |
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 8A2242C29D; Sun, 28 May 2017 11:27:12 -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 TaXKbWgwvu6N; Sun, 28 May 2017 11:27:12 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 098AF2C2A1; Sun, 28 May 2017 11:27:12 -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 185042C2A1 for <mercurial-devel@mercurial-scm.org>; Sun, 28 May 2017 11:27:10 -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 dyieMGiXBrac for <mercurial-devel@mercurial-scm.org>; Sun, 28 May 2017 11:27:08 -0400 (EDT) Received: from mail-pf0-x229.google.com (mail-pf0-x229.google.com [IPv6:2607:f8b0:400e:c00::229]) by mercurial-scm.org (Postfix) with ESMTPS id E4E162C29D for <mercurial-devel@mercurial-scm.org>; Sun, 28 May 2017 11:27:08 -0400 (EDT) Received: by mail-pf0-x229.google.com with SMTP id 9so37299304pfj.1 for <mercurial-devel@mercurial-scm.org>; Sun, 28 May 2017 08:27:08 -0700 (PDT) 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 :user-agent:date:from:to:cc; bh=p/dPjkd9Ic+f69OLsIdvADzY28rjq0j1DsG4dr09Eu8=; b=TQLHQvB7yvwvfHAiygMhs0rHzWfnqRZ6vCptIHkzX8F1lhJxNhgAKQDeOyhmN0Q13k KDqCBGuhRNzIHDi7MFIxyiiKDU5Sd3w/rqcfMWNL4WH5gH+bhqAeJDP109fO7a1HHklv 5dDeOLDEOfS1qVxZrLQq2MUNpE5uS96Td7twMXSP9H+yytsS6zWQ/3JcxyWeT1xTXaQV Ns17d3e7T4tbjHgH0kMInPYBZ65yMCEtss+Vus2Q6BUc9CeNMVOr0KlpZJmyZfRYHsOQ WS59Yr3dXGF9qKTc68tIPZw+M66ZNW3HHlseCAC5PxCnzk1SeKeilggO/Fc6eFywIU9r cnKw== 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:user-agent:date:from:to:cc; bh=p/dPjkd9Ic+f69OLsIdvADzY28rjq0j1DsG4dr09Eu8=; b=QnJlckea/9EJ/aNZVgNE2nxlrcUiK1PTd2uuLG0hkwDyDKImjcDN2gBTxCv8bGRdzv 8kbYkq1IGmOsTVtrD/ZmOU3SR3P6rw9Heaeqhw4kEgMkmWJmpI60eDaRWA9nwNqxXpyx g3RlUWWVYI3DzToniZ33KOxhcAnyMn4jertfLpmasSPdb5q1h1TB2E7+KK5+Ngu8D2gp rOMeLlaeb7FRDGouO4d0/LlL0/0FHoDFjEXojvYe1meKGk90zw2fxTvkVtvwLVjOtyE8 S7Pvicc7pLECQzcP/XFPmuo7uaEYWkgtuldS1GEgoLaO31/EQdIxHDJOqmT2HjnUX8AB R2xA== X-Gm-Message-State: AODbwcDBDLqHVDrawJnroIWNfrTrLg0p96iXgjqh7/eotS8f1oarn8Wv BIT8uQU8y7zTyp7zido= X-Received: by 10.98.14.13 with SMTP id w13mr13081553pfi.59.1495985227726; Sun, 28 May 2017 08:27:07 -0700 (PDT) Received: from [127.0.1.1] (p784a2ae9.tkyea126.ap.so-net.ne.jp. [120.74.42.233]) by smtp.gmail.com with ESMTPSA id d3sm12097252pfg.30.2017.05.28.08.27.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 May 2017 08:27:06 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 1 of 2] match: remove override of prefix() from differencematcher X-Mercurial-Node: cad7aca56f0bf3d5865cc07ee9616568ada78c36 X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <cad7aca56f0bf3d5865c.1495985168@mimosa> X-Mercurial-Series-Id: <cad7aca56f0bf3d5865c.1495985168@mimosa> User-Agent: Mercurial-patchbomb/4.2+344-b647b923486f Date: Mon, 29 May 2017 00:26:08 +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 - May 28, 2017, 3:26 p.m.
Patch
diff --git a/mercurial/match.py b/mercurial/match.py --- a/mercurial/match.py +++ b/mercurial/match.py @@ -480,9 +480,6 @@ class differencematcher(basematcher): def anypats(self): return self._m1.anypats() or self._m2.anypats() - def prefix(self): - return not self.always() and not self.isexact() and not self.anypats() - def __repr__(self): return ('<differencematcher m1=%r, m2=%r>' % (self._m1, self._m2))