From patchwork Fri Dec 14 12:47:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: py3: fix bad escapes of sub() replacement pattern in test-template-basic.t From: Yuya Nishihara X-Patchwork-Id: 37137 Message-Id: <55d0252b56e9af55bc4c.1544791660@mimosa> To: mercurial-devel@mercurial-scm.org Date: Fri, 14 Dec 2018 21:47:40 +0900 # HG changeset patch # User Yuya Nishihara # Date 1544789959 -32400 # Fri Dec 14 21:19:19 2018 +0900 # Node ID 55d0252b56e9af55bc4ccbda921fdd01f0c2ff54 # Parent eed9a62e1f1098f641aacd3de6e0d84d53a1cdd6 py3: fix bad escapes of sub() replacement pattern in test-template-basic.t Python 3.7 starts complaining about it. We have to double the backslash or '\x5c' to get around. diff --git a/tests/test-template-basic.t b/tests/test-template-basic.t --- a/tests/test-template-basic.t +++ b/tests/test-template-basic.t @@ -860,7 +860,7 @@ Test string escaping in nested expressio $ hg log -R a -r 8 --template '{join(files, ifeq(branch, "default", r"\x5c\x786e"))}\n' fourth\x5c\x786esecond\x5c\x786ethird - $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\x5c\x786e", "\x5c\x786e"), desc)}\n' + $ hg log -R a -r 3:4 --template '{rev}:{sub(if("1", "\x6e"), ifeq(branch, "foo", r"\\x5c\\x786e", "\x5c\x5c\x786e"), desc)}\n' 3:\x6eo user, \x6eo domai\x6e 4:\x5c\x786eew bra\x5c\x786ech