Submitter | Yuya Nishihara |
---|---|
Date | May 8, 2015, 5:34 a.m. |
Message ID | <20150508143435.6d224c785f0263786edf74c7@tcha.org> |
Download | mbox | patch |
Permalink | /patch/8964/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@selenic.com> X-Original-To: patchwork@patchwork.serpentine.com Delivered-To: patchwork@patchwork.serpentine.com Received: from waste.org (waste.org [173.11.57.241]) by bz.selenic.com (Postfix) with ESMTP id 36FC43BBCF for <patchwork@patchwork.serpentine.com>; Fri, 8 May 2015 01:36:55 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id CCEF874012; Fri, 8 May 2015 00:36:54 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id R0csNnm4mYDP; Fri, 8 May 2015 00:36:54 -0500 (CDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id DC7DD7405E; Fri, 8 May 2015 00:36:08 -0500 (CDT) X-Original-To: mercurial-devel@waste.org Delivered-To: mercurial-devel@waste.org Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id 43B8B7405B for <mercurial-devel@waste.org>; Fri, 8 May 2015 00:36:06 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id qNhU+GtBCw48 for <mercurial-devel@waste.org>; Fri, 8 May 2015 00:36:04 -0500 (CDT) Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com [209.85.192.170]) by waste.org (Postfix) with ESMTPS id ED51174012 for <mercurial-devel@selenic.com>; Fri, 8 May 2015 00:35:33 -0500 (CDT) Received: by pdbqd1 with SMTP id qd1so64850346pdb.2 for <mercurial-devel@selenic.com>; Thu, 07 May 2015 22:35:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=AII2tmg/nMZI+8gU5/fffoePP+CCtUGhxoR1ujcVLD8=; b=YkKezDrLXbUHkS7udcIRONPcENUiv/DduXrHedTn/rvIhjrJ2Ei6W7I0REbvqImGpy 2VJigKvQthAmOOjIPU3Nk7a3gpl/VT3/bIrU+ycHBKtcaoqLo0PR1BXnXB7bjym3yB/z YUskXmJDM8vGAc2LF7HYm8Y/+ma9eciLurlXhn1st9wbVIRK4JiU2bvLs9kO1y0+YsI5 b9WcOheERc/jZJy9hY2y64B5uPkJ5iHt4psm/gj3KIr04BvxbLArw8H6oSi2X6w8iSyt meFjvjFZH0lbBGPbeKi41aBjkJhtk/bz/TIMxiwJs3QYGh3YDNzxqSoGrTpqKHHcWt9t RErw== X-Received: by 10.68.197.39 with SMTP id ir7mr3573443pbc.87.1431063332449; Thu, 07 May 2015 22:35:32 -0700 (PDT) Received: from mimosa (flets-202-70-212-57.client.pikara.ne.jp. [202.70.212.57]) by mx.google.com with ESMTPSA id f1sm3833340pds.62.2015.05.07.22.35.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2015 22:35:31 -0700 (PDT) Date: Fri, 8 May 2015 14:34:35 +0900 From: Yuya Nishihara <yuya@tcha.org> To: Sean Farley <sean@farley.io> Subject: Re: [PATCH 1 of 2 STABLE] templater: do not process \-escapes at parsestring() (issue4290) Message-Id: <20150508143435.6d224c785f0263786edf74c7@tcha.org> In-Reply-To: <m2ioc328r6.fsf@farley.io> References: <888d7a553f2b0ace8563.1430783711@mimosa> <m2ioc328r6.fsf@farley.io> X-Mailer: Sylpheed 3.5.0beta1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) Mime-Version: 1.0 Cc: mercurial-devel@selenic.com X-BeenThere: mercurial-devel@selenic.com X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.selenic.com> List-Unsubscribe: <http://selenic.com/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@selenic.com?subject=unsubscribe> List-Archive: <http://selenic.com/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@selenic.com> List-Help: <mailto:mercurial-devel-request@selenic.com?subject=help> List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@selenic.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@selenic.com Sender: "Mercurial-devel" <mercurial-devel-bounces@selenic.com> |
Comments
Yuya Nishihara - May 8, 2015, 5:34 a.m.
Patch
--- a/mercurial/templater.py +++ b/mercurial/templater.py @@ -623,7 +623,7 @@ def parsestring(s, quoted=True): if quoted: if len(s) < 2 or s[0] != s[-1]: raise SyntaxError(_('unmatched quotes')) - return s[1:-1] + return s[1:-1].replace('\\%s' % s[0], s[0]) return s