Patchwork templater: remove workaround for escaped quoted string in quoted template

login
register
mail settings
Submitter Yuya Nishihara
Date June 30, 2015, 2:41 p.m.
Message ID <20150630234153.b971e3525ab6dda9d8a653be@tcha.org>
Download mbox | patch
Permalink /patch/9831/
State Accepted
Headers show

Comments

Yuya Nishihara - June 30, 2015, 2:41 p.m.
This patch should fix the future test failure when "templater: parse \"...\"
as string for 2.9.2-3.4 compatibility (issue4733)" is merged to default.

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1435386526 -32400
#      Sat Jun 27 15:28:46 2015 +0900
# Node ID bffa8e18149a1cb41b22bb36841d79d363e02b25
# Parent  ebd156b3faca120e7b009727f191504df9b8c50f
templater: remove workaround for escaped quoted string in quoted template

This patch backs out 554d6fcc3c84 which should no longer be needed.

The test for '{\"invalid\"}' is removed because the parser is permissive for
\"...\" literal.
Matt Mackall - July 1, 2015, 7:24 p.m.
On Tue, 2015-06-30 at 23:41 +0900, Yuya Nishihara wrote:
> This patch should fix the future test failure when "templater: parse \"...\"
> as string for 2.9.2-3.4 compatibility (issue4733)" is merged to default.
> 
> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1435386526 -32400
> #      Sat Jun 27 15:28:46 2015 +0900
> # Node ID bffa8e18149a1cb41b22bb36841d79d363e02b25
> # Parent  ebd156b3faca120e7b009727f191504df9b8c50f
> templater: remove workaround for escaped quoted string in quoted template

Queued for default, thanks.

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -698,21 +698,7 @@  def unquotestring(s):
     '''unwrap quotes'''
     if len(s) < 2 or s[0] != s[-1]:
         raise SyntaxError(_('unmatched quotes'))
-    # de-backslash-ify only <\">. it is invalid syntax in non-string part of
-    # template, but we are likely to escape <"> in quoted string and it was
-    # accepted before, thanks to issue4290. <\\"> is unmodified because it
-    # is ambiguous and it was processed as such before 2.8.1.
-    #
-    #  template  result
-    #  --------- ------------------------
-    #  {\"\"}    parse error
-    #  "{""}"    {""} -> <>
-    #  "{\"\"}"  {""} -> <>
-    #  {"\""}    {"\""} -> <">
-    #  '{"\""}'  {"\""} -> <">
-    #  "{"\""}"  parse error (don't care)
-    q = s[0]
-    return s[1:-1].replace('\\\\' + q, '\\\\\\' + q).replace('\\' + q, q)
+    return s[1:-1]
 
 class engine(object):
     '''template expansion engine.
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -2870,9 +2870,6 @@  stripped before parsing:
   $ hg log -r 2 --style ../escquotetmpl
   " \" \" \\" head1
 
-  $ hg log -r 2 -T esc --config templates.esc='{\"invalid\"}\n'
-  hg: parse error at 1: syntax error
-  [255]
   $ hg log -r 2 -T esc --config templates.esc='"{\"valid\"}\n"'
   valid
   $ hg log -r 2 -T esc --config templates.esc="'"'{\'"'"'valid\'"'"'}\n'"'"