filemerge: use util.shellquote when calling merge (issue3581)

--HG--
branch : stable
revset: accept @ in unquoted symbols (issue3686)

--HG--
branch : stable
url: use open and not url.open for local files (issue3624)

--HG--
branch : stable
mq: fix qrefresh case sensitivity (issue3271)

When calling qrefresh with filenames, the filenames were being
treated as case-sensistive on case-insensitive file systems.
So 'qrefresh foo' would not match file 'Foo', and it failed silently.
This fix makes it work correctly on case-insensitive file systems.

Previously the matching function was applied directly to the filenames.
Now we apply the matching function through repo.status, which handles
the case logic for us. A side effect of using repo.status is that
if the qrefresh file doesn't exist, there is output stating it
doesn't exist.

Adds a test to an existing mq refresh case test.

--HG--
branch : stable
icasefs: make case-folding collision detection as deletion aware (issue3648)

Before this patch, case-folding collision is checked simply between
manifests of each merged revisions.

So, files may be considered as colliding each other, even though one
of them is already deleted on one of merged branches: in such case,
merge causes deleting it, so case-folding collision doesn't occur.

This patch checks whether both of files colliding each other still
remain after merge or not, and ignores collision if at least one of
them is deleted by merge.

In the case that one of colliding files is deleted on one of merged
branches and changed on another, file is considered to still remain
after merge, even though it may be deleted by merge, if "deleting" of
it is chosen in "manifestmerge()".

This avoids fail to merge by case-folding collisions after choices
from "changing" and "deleting" of files.

This patch adds only tests for "removed remotely" code paths in
"_remains()", because other ones are tested by existing tests in
"test-casecollision-merge.t".

--HG--
branch : stable
i18n: add "i18n" comment to error messages of template functions

--HG--
branch : stable
i18n: add "i18n" comment to column positioning messages of "hg log"

This comment makes it easier to distinguish such messages from others
for message translators.

--HG--
branch : stable
i18n: add "i18n" comment to column positioning messages of "hg summary"

This comment makes it easier to distinguish such messages from others
for message translators.

--HG--
branch : stable
i18n: make column positioning message of MQ summary output translatable

Before this patch, one of column positioning messages of MQ summary
output is not translatable, and patches are always listed up at fixed
column position like below, when patch queue is not empty:

    mq:     1 applied, 1 unapplied

But column positioning messages for other summarized information are
translatable, so other information may be displayed at different
column position on non-English locale environments.

This patch makes column positioning message of MQ summary output
translatable.

--HG--
branch : stable
i18n: change output of largefiles for summary to distinguish from one for outgoing

Before this patch, largefiles extension uses "largefiles: No remote
repo" message not only for "outgoing" as status report, but also for
"summary" as summarized information.

This sharing prevents message translators from inserting white spaces
between "largefiles:" and "No remote repo" in translated message to
align column position of summarized information.

This patch changes output of largefiles for summary to distinguish
from one for outgoing.

This patch puts "no remote repo" into parentheses, because this is not
summarized information.

--HG--
branch : stable
subrepo: only do clean update when overwrite is set (issue3276)

Files in a subrepo were overwritten on update. But this should only happen on a
clean update (example: -C is specified).
Use the overwrite parameter introduced for svn subrepos in c19b9282d3a7 to
decide whether to merge changes (as update) or remove them (as clean).

The new function hg.updaterepo is intruduced to keep all update calls in hg.

test-subrepo.t is extended to test if an untracked file is overwritten
(issue3276). (Update -C is already tested in many places.)
The first two chunks are debugging output which has changed. (Because overwrite
is not always true anymore for subrepos)
All other tests still pass without any change.

--HG--
branch : stable
i18n-ja: synchronized with 0188ddfa844e

--HG--
branch : stable
i18n-pt_BR: synchronized with 36ed69d4593d

--HG--
branch : stable
merge with i18n

--HG--
branch : stable