Matt Mackall <mpm@selenic.com> [Fri, 01 May 2015 16:49:15 -0500] rev 24894
Added signature for changeset 8cc6036bca53
Matt Mackall <mpm@selenic.com> [Fri, 01 May 2015 16:48:51 -0500] rev 24893
Added tag 3.4 for changeset 8cc6036bca53
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 02 May 2015 00:15:03 +0900] rev 24892
tests: make tests with temporary environment setting portable
With "dash" (as "/bin/sh" on Debian GNU/Linux), command execution in
"ENV=val foo bar" style doesn't work as expect in test script files,
if "foo" is user-defined function: it works fine, if "foo" is existing
commands like "hg".
09049042ab99 introduced tests for HGPLAIN and HGPLAINEXCEPT into
test-revset.t, and all of them are in such style.
This patch doesn't:
- add explicit unsetting for HGPLAIN and HGPLAINEXCEPT
they are already introduced by 09049042ab99
- write assignment and exporting in one line
"ENV=val; export ENV" for two or more environment variables in one
line causes failure of test-check-code-hg.t: it is recognized as
"don't export and assign at once" unfortunately.
Matt Harbison <matt_harbison@yahoo.com> [Thu, 30 Apr 2015 23:02:52 -0400] rev 24891
debuginstall: expand the editor path before searching for it (issue4380)
The editor launches without expanding the path with commits because the shell
does that for us.
If the path isn't an executable, the expanded path is displayed, which is
probably more useful than the unexpanded path. For example, in cmd.exe, '~'
expands to C:\Users\$user. But it expands to C:/mingw/msys/1.0/home/$user in
MinGW.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Fri, 01 May 2015 22:19:20 +0900] rev 24890
censor: fix incorrect configuration name for ignoring error at censored file
According to recent "filectx.data()" implementation, "censor.policy"
should be configured as "ignore" to ignore error at censored file:
"censor.allow" seems outdated name.
Matt Mackall <mpm@selenic.com> [Thu, 30 Apr 2015 17:50:50 -0500] rev 24889
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 30 Apr 2015 19:12:28 +0900] rev 24888
i18n-ja: synchronized with 194207694def
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 29 Apr 2015 16:43:02 -0300] rev 24887
i18n-pt_BR: synchronized with 89fe9921511f
Ryan McElroy <rmcelroy@fb.com> [Thu, 30 Apr 2015 12:33:36 -0700] rev 24886
templater: fail more gracefully for blank strings to word
Matt Harbison <matt_harbison@yahoo.com> [Wed, 29 Apr 2015 21:14:59 -0400] rev 24885
windows: make shellquote() quote any path containing '\' (issue4629)
The '~' in the bug report is being expanded to a path with Windows style slashes
before being passed to shellquote() via util.shellquote(). But shlex.split()
strips '\' out of the string, leaving an invalid path in dispatch.aliasargs().
This regressed in 1642eb429536.
For now, the tests need to be conditionalized for Windows (because those paths
are quoted). In the future, a more complex regex could probably skip the quotes
if all component separators are double '\'. I opted to glob away the quotes in
test-rename-merge2.t and test-up-local-change.t (which only exist on Windows),
because they are in very large blocks of output and there are way too many diffs
to conditionalize with #if directives. Maybe the entire path should be globbed
away like the following paths in each changed line. Or, letting #if directives
sit in the middle of the output as was mentioned a few months back would work
too.
Unfortunately, I couldn't figure out how to test the specific bug. All of the
'hg serve' tests have a #require serve declaration, causing them to be skipped
on Windows. Adding an alias for 'expandtest = outgoing ~/bogusrepo' prints the
repo as '$TESTTMP/bogusrepo', so the test runner must be changing the
environment somehow.