Yuya Nishihara <yuya@tcha.org> [Fri, 08 May 2015 18:11:26 +0900] rev 24966
templater: strip single backslash before quotation mark in quoted template
db7463aa080f fixed the issue of double escapes, but it made the following
template fail with syntax error because of <\">. Strictly speaking, <\">
appears to be invalid in non-string part, but we are likely to escape <">
if surrounded by quotes, and we are used to write such templates by trial
and error.
[templates]
sl = "{tags % \"{ifeq(tag,'tip','',label('log.tag', ' {tag}'))}\"}"
So, for backward compatibility between 2.8.1 and 3.4, a single backslash
before quotation mark is stripped only in quoted template. We don't care
for <\"> in string literal in quoted template, which never worked as expected
before.
template result
--------- ------------------------
{\"\"} parse error
"{""}" {""} -> <>
"{\"\"}" {""} -> <>
{"\""} {"\""} -> <">
'{"\""}' {"\""} -> <">
"{"\""}" parse error (don't care)
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 07 May 2015 23:18:48 -0700] rev 24965
run-tests: implement Test._testMethodName
This methods is needed internally by utilities like __repr__. I do not see any
harm in having it declared. Any actual attempt to use it to call a test would
crash, but at least random debug print in the test runner will no longer crash.
Another approach would have been to redefine the __repr__ function, but I think
it a good thing to have some respect for the base class API.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 07 May 2015 16:43:58 -0700] rev 24964
test-subrepo-git: ignore pax_global_header when listing archive
5115d03440f4 is adding a new tar call but forgot to filter out the
pax_global_header file that some tar versions write. This is similar to what
happened in 5dda6c708138.
Pierre-Yves David <pierre-yves.david@fb.com> [Thu, 07 May 2015 14:57:02 -0700] rev 24963
test-subrepo-recursion: glob out all the date listed by unzip -l
This date output is unstable (01-01-1980 vs 1980-01-01). As the test is not
about the modification date, we glob the data out.
Caught by buildbot.
Ryan McElroy <rmcelroy@fb.com> [Tue, 14 Apr 2015 13:31:50 -0700] rev 24962
bookmarks: remove unused updatecurrentbookmark function (API)
This function was not used anywhere in core and there is no indication that
it is used elsewhere either.
Yuya Nishihara <yuya@tcha.org> [Sun, 10 May 2015 11:39:01 -0500] rev 24961
changelog: drop unnecessary override of "hasnode"
revlog.hasnode() calls self.rev(node) that takes filtering into account.
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 May 2015 11:32:24 -0700] rev 24960
test-run-test: unset run-test specific environment variables
Otherwise variable set for the real test run interfere with the test runner
tests.
Durham Goode <durham@fb.com> [Fri, 01 May 2015 15:45:07 -0700] rev 24959
histedit: fix --continue when rules are finished
If histedit failed after all the rules were complete (for instance, if there was
an exception in the cleanup phase), you couldn't --continue because it was
unable to pop a rule. Let's just skip the rule execution phase of --continue if
there are no more rules.
Durham Goode <durham@fb.com> [Fri, 01 May 2015 15:28:47 -0700] rev 24958
histedit: fix serializing of None backupfile
If the histedit backupfile was None (like if evolve is enabled) it would get
serialized as 'None' into the state file. Later if the histedit was aborted and
the top most commit was unreachable (ex: if it was obsolete or stripped),
histedit would try to unbundle the backupfile and try to read .hg/None.
This fixes it to not serialize None. Since it only happens with evolve, I'm not
sure how to add test coverage here.
Matt Mackall <mpm@selenic.com> [Thu, 07 May 2015 14:19:20 -0500] rev 24957
merge with stable