Matt Mackall <mpm@selenic.com> [Tue, 01 Apr 2014 17:56:55 -0500] rev 20873
Added tag 2.9.2 for changeset 3f83fc5cfe71
Yuya Nishihara <yuya@tcha.org> [Sat, 08 Mar 2014 18:52:16 +0900] rev 20872
backout: correct commit status of no changes made (BC) (issue4190)
If backout generated no changes to commit, it showed wrong status, "changeset
<target> backs out changeset <target>", and raised TypeError with -v option.
This changes the return code to 1, which is the same as "hg commit" and
"hg rebase".
Yuya Nishihara <yuya@tcha.org> [Sat, 08 Mar 2014 18:41:56 +0900] rev 20871
backout: document return code of merge conflict
Matt Mackall <mpm@selenic.com> [Tue, 01 Apr 2014 15:11:19 -0500] rev 20870
merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 Apr 2014 02:46:03 +0900] rev 20869
i18n: fix "% inside _()" problems
Before this patch, "contrib/check-code.py" can't detect these
problems, because the regexp pattern to detect "% inside _()" doesn't
suppose the case that format string consists of multiple string
components concatenated implicitly or explicitly,
This patch does below for that regexp pattern to detect "% inside _()"
problems in such case.
- put "+" into separator part ("[ \t\n]") for explicit concatenation
("...." + "...." style)
- enclose "component and separator" part by "(?:....)+" for
concatenation itself ("...." "...." or "...." + "....")
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 Apr 2014 02:46:03 +0900] rev 20868
i18n: fix "% inside _()" problems
Before this patch, "contrib/check-code.py" can't detect these
problems, because the regexp pattern to detect "% inside _()" doesn't
suppose the case that the format string and "%" aren't placed in the
same line.
This patch replaces "\s" in that regexp pattern with "[ \t\n]" to
detect "% inside _()" problems in such case.
"[\s\n]" can't be used in this purpose, because "\s" is automatically
replaced with "[ \t]" by "_preparepats()" and "\s" in "[]" causes
nested "[]" unexpectedly.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 01 Apr 2014 02:46:03 +0900] rev 20867
merge: fix lack of "%s" in format string causing TypeError at runtime
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 01 Apr 2014 13:27:12 -0300] rev 20866
i18n-pt_BR: synchronized with c57c9cece645
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 31 Mar 2014 21:03:39 +0900] rev 20865
i18n-ja: synchronized with e259d4c462b5
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 19 Mar 2014 23:04:03 -0700] rev 20864
bundle2: support unbundling empty part
We augment the unbundler to make it able to unbundle the empty part we are now
able to bundle.