Submitter | Yuya Nishihara |
---|---|
Date | March 2, 2018, 12:26 a.m. |
Message ID | <47a09e779081aed56301.1519950383@mimosa> |
Download | mbox | patch |
Permalink | /patch/28628/ |
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 C530F2C2C2; Thu, 1 Mar 2018 19:27:06 -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 s2116GEwvuI5; Thu, 1 Mar 2018 19:27:06 -0500 (EST) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 189C02C2BE; Thu, 1 Mar 2018 19:27:04 -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 9D6792C1C8 for <mercurial-devel@mercurial-scm.org>; Thu, 1 Mar 2018 19:27:02 -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 T3SZb53Gbd6p for <mercurial-devel@mercurial-scm.org>; Thu, 1 Mar 2018 19:27:02 -0500 (EST) Received: from mail-qt0-x22f.google.com (mail-qt0-x22f.google.com [IPv6:2607:f8b0:400d:c0d::22f]) by mercurial-scm.org (Postfix) with ESMTPS id 429DA2C2C1 for <mercurial-devel@mercurial-scm.org>; Thu, 1 Mar 2018 19:26:58 -0500 (EST) Received: by mail-qt0-x22f.google.com with SMTP id t6so9986923qtn.9 for <mercurial-devel@mercurial-scm.org>; Thu, 01 Mar 2018 16:26:58 -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=3tE47+5tL6IZJYh5g5aszVVFCQD/Wfr4cv2RlCSqZg8=; b=lLD/ZKAl89/gTr1seFmbyZbrAn/xzAFSricutsoeI4mD3mTHrKEB9e60JitfkGU0Gt Mt9Cfiw6ZduD5MrM6DSNM43ySQIIW8rmlvfLKBxsk7lVkBiocNQoZNDv3actmnpvMMRl 2tv+lPERWiptK8k448YYpnneCYwEArLo6xoiK6DxPn8SyuVEjgsPzJbxOhwbhj2fi/0/ 8eunVxtdeGP1lJ8uG7YreX6wqSVtecABKXOV5Mn6rcDsHMcrWeGywisR7t0FwLxCOZ/j 3HC/KKYwomSJyw33gzQQ+Fc9yMfjNoNdmELgvwYfEdKQkVGXpB8QSPiAbuYmAmRbReI8 zayw== 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=3tE47+5tL6IZJYh5g5aszVVFCQD/Wfr4cv2RlCSqZg8=; b=VilkpOAKwKKIs+MbEKPEju96s3tCpPS0tpmSF1JCWBpcQLUF5S7b7FOOdU9GjQAZJ1 QFKwYdqeLOJyz85XYzL3HnHjoIw9jZS23CKsQdTYfO1dLK+XG91zeGs906QbUVtkM21g AOTOZCblnG6pJ1ckLIHrPc1hcrR5GszpT6F6+IEcJYP2fMZ8k1bxA6NvJD7NXB28Pcyo jFKIo4MmPTYjdZyUr1dDA50ynexu4cqqBTU8dYr89C1RTh1Dy1Cz8QEgb/HofJpgH2Xn 0cNz3x1hzKq2V+o3sHH66VKAsCmH9KBDfsFqYuv4WAdGqzKnfjAOmNxL+7MoWt3mpCtl Cngg== X-Gm-Message-State: AElRT7EKEh/vEPI6KAKxyEeZ4ixIoTgOKUV47/WoOuqFA2CuU2fb4sBP yUATbbSekdKnJDvjzzcL545NEMH0 X-Google-Smtp-Source: AG47ELs7rvH979efEBJ+fhZbd2Vqje3+X9Ts8XXVs06lmESfDfsKAW2J3oyP2k4aOD/Sr3oVDuE8+A== X-Received: by 10.237.49.195 with SMTP id 61mr6107883qth.44.1519950417645; Thu, 01 Mar 2018 16:26:57 -0800 (PST) Received: from [127.0.1.1] ([2620:15c:6:fd00:7e7a:91ff:fec3:bcc]) by smtp.gmail.com with ESMTPSA id n4sm3045409qtc.0.2018.03.01.16.26.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 16:26:56 -0800 (PST) MIME-Version: 1.0 Subject: [PATCH 04 of 10] py3: drop b'' from error message generated by templater.runmember() X-Mercurial-Node: 47a09e779081aed563018208407c771ede557ffd X-Mercurial-Series-Index: 4 X-Mercurial-Series-Total: 10 Message-Id: <47a09e779081aed56301.1519950383@mimosa> X-Mercurial-Series-Id: <8d4520c4501899f53310.1519950380@mimosa> In-Reply-To: <8d4520c4501899f53310.1519950380@mimosa> References: <8d4520c4501899f53310.1519950380@mimosa> User-Agent: Mercurial-patchbomb/4.5+624-e46b24582fa0 Date: Thu, 01 Mar 2018 19:26:23 -0500 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 - March 2, 2018, 12:26 a.m.
Patch
diff --git a/mercurial/templater.py b/mercurial/templater.py --- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -548,7 +548,7 @@ def runmember(context, mapping, data): if sym: raise error.ParseError(_("keyword '%s' has no member") % sym) else: - raise error.ParseError(_("%r has no member") % d) + raise error.ParseError(_("%r has no member") % pycompat.bytestr(d)) def buildnegate(exp, context): arg = compileexp(exp[1], context, exprmethods)