merge default int stable for 2.6 code freeze

--HG--
branch : stable
Added tag 2.6-rc for changeset 292cd385856d

--HG--
branch : stable
Added signature for changeset 292cd385856d

--HG--
branch : stable
translations: change label integer error to not specify the kind of label

The current error message used the kind (bookmark, branch, tag) in the message.
Unfortunately this isn't easily translatable since some languages give different
genders to these words. The fix is to not specify it at all, since it should be
implicit based on the command the user just ran.

Relevant discussions around this area:
http://selenic.com/pipermail/mercurial-devel/2012-October/045567.html
http://selenic.com/pipermail/mercurial-devel/2012-October/045600.html

--HG--
branch : stable
largefiles: fix typos in documentation

--HG--
branch : stable
color: turn colorui functions into forwards when color is None

colorui will be set to None as necessary in an upcoming patch.

--HG--
branch : stable
color: set _colormode to None when mode is unset (issue3895)

Previously, colorui assumed that it would only be called when mode wasn't
None. 7ae12ce87594 changed that, so now colorui needs to care about whether it
should colorize output.

--HG--
branch : stable
color: add a test with extension loaded and ui.formatted=False

--HG--
branch : stable
css: fixed font-family

There is no 'sans' font-family, replaced with 'sans-serif'

--HG--
branch : stable
css: remove repeated property

'margin' property was repeated for the same selector

--HG--
branch : stable
i18n-pt_BR: synchronized with 64ea454e7d76

--HG--
branch : stable
merge with i18n

--HG--
branch : stable
hgweb: make help verbose again (issue3899)

Due to regression introduced in f5db3092790f, help in hgweb
was rendered in non-verbose form (issue3899)

--HG--
branch : stable
check-code: add a rule against a GNU sed-ism

BSD sed requires the 'i' command to be followed with a backslash and a
newline, like so:

  $ sed -e '/^@/i\
  > other'

We've encountered this problem before, e.g. in test-mq.t (900767dfa80d).
This change adds a check-code rule and fixes two instances of the
problem in test-record.t.

--HG--
branch : stable
check-code: expand sed rule to include more offenders

Expands the rule added in 5e4491c114b2 to include cases where the
address is a line number instead of a regular expression, and fixes an
instance of this pattern in test-unionrepo.t.

--HG--
branch : stable
blackbox: don't run permission tests on non-unix systems

The windows and vfat test runs were failing due to read/write permissions not
working the same on those systems.  On vfat, permissions can't be changed
at all, and on windows it seems the chmod emulation doesn't remove read
permissions.  We could theoretically get the 'cannot write to blacklog.log'
test to pass on windows but there's no #if condition to let us exclude vfat
only.

Verified that test-blackbox passes on windows now.

--HG--
branch : stable
check-code: fix sed 'i' command rule newline matching

The regular expression was meant to match cases where an 'i' command was
not followed by precisely a '\' and then a newline; it failed to match
the newline, so cases with a '\' but no newline would erroneously pass.

--HG--
branch : stable
tests: make sed usage in test-unionrepo.t cross-platform

Usage of the 'i' command proves tricky. I tried to write a check-code rule, but
failed.

--HG--
branch : stable
extra : rebase_source : cb3e4e9df7cb5fff90f6b43ab262ab1b7679d72e
i18n: show the non-ASCII password prompt text correctly

Before this patch, the prompt text for asking password is directly
passed to "getpass.getpass()" of Python standard library.

In "getpass.getpass()" implementation on Windows environment, the
prompt text is split into byte sequence and "msvcrt.putch()" is
applied on each bytes in it. This splitting causes non-ASCII prompt
text to be broken.

This patch shows the prompt text for asking password on "ui.getpass()"
side, and invokes "getpass.getpass()" with empty prompt text. This
prevents non-ASCII prompt text from being broken in
"getpass.getpass()" implementation.

This patch also sets "ui.prompt" label to prompt text to follow
"ui.prompt()" style.

--HG--
branch : stable
tests: rename from test-config-case.t to test-config.t for centralization

Before this patch, there is no test script testing configuration
handling generally. "test-config-case.t" seems to be specific for
testing case sensitive configuration.

This patch renames from "test-config-case.t" to "test-config.t" for
centralization of tests around configuration handling.

--HG--
branch : stable
rename : tests/test-config-case.t => tests/test-config.t