i18n-pt_BR: synchronized with 6ba51c81ff75

i18n-ru: translated help for multirevs-subrepos

i18n-da: translate hg.1.html header

i18n: merge with stable

i18n-ru: translated help for merge-tools

i18n-ru: translated help for hgignore

i18n-pt_BR: add lost translation used in test-i18n.t Changeset e6a6e7ebd585 replaced the Portuguese translation with the English original and broke the test.

i18n: merge with main

i18n: merge with main

merge with stable

i18n-ru: translated help for merge-tools

i18n-ru: translated help for hgignore

i18n-pt_BR: synchronized with 72e4fcb43227

i18n-ru: drop executable bit from .po file

merge with stable

i18n: merge with main This includes four i18n changesets transplanted from the default branch to the stable branch since they were made after the freeze.

i18n-ru: glossary translated

i18n-ru: tranlated docstrings from filesets added in 1575dc5d399a

i18n-ru: translated help for extensions and filesets

i18n-ru: translated new config.txt

i18n: merge with main

i18n-pt_BR: synchronized with 94eea58da2a3

fileset: add i18n hints for keywords

merge with i18n

merge with i18n

18n-sv: translated all new fuzzy strings

i18n-ru: glossary translated

i18n-ru: tranlated docstrings from filesets added in 1575dc5d399a

i18n-ru: translated help for extensions and filesets

merge with i18n

i18n-pt_BR: synchronized with 6c7283faa967

merge with i18n

i18n-ru: translated new config.txt

i18n-pt_BR: messages from crew f9c056f48018

i18n-pt_BR: synchronized with 15200b46165b

wix: add missing templates/paper/diffstat.tmpl

hgweb: treat branch attribute `closed' as more important than `inactive' In the branches page, branches that are closed and are merged into another branch are displayed as `inactive'. This patch changes that behaviour to show these branches as `closed'. For me, the `closed' attribute is more important than the `inactive' attribute. Branches that are not closed, and are merged into other branches will still be shown as `inactive'. Branches that are closed, and are not merged into other branches will still be shown as `closed'.

tests: add basic commandserver test

color: for the sake of "less -R", default to ansi in auto mode (issue2792) less with the -R option only supports ANSI color codes, and terminfo mode issue non-ANSI color codes (depending on the database). The -r option can work around this, but there are users currently using the -R option, and defaulting to terminfo would break colorization in less for them without warning.

color: fix TypeError with auto mode on win32 when colors aren't available (issue2871) This can happen when stdout isn't a terminal (e.g., it's being piped).

test-revert: add revert --all case when nothing changed supposed to succeed without notice

subrepos: be smarter about what's an absolute path (issue2808)

test-wireprotocol.py: rename to test-wireproto.py for consistency 1. The module named 'wireproto' is tested. 2. There already is a test-wireproto.t for related tests on shell level.

classes: fix class style problems found by b071cd58af50 This makes test-wireprotocol.py work on Python 2.4

check-code: fix class style checking (with tests) - old-style classes were only checked for one-letter class names - add check for new-style classes with empty parent class, because this is not available in Python 2.4

tests: ignore inotify extension in test-duplicateoptions.py The inotify extension is only available on linux and setup.py will not install it on other platforms - but it will of course always be there in the source. test-duplicateoptions.py tried to load most extensions (including inotify if available). When the local uninstalled Mercurial was used it would thus always load the inotify extension and cause a warning on unsupported platforms. The inotify extension is not relevant for this test, so now we explicitly ignore it.

error: Add a hint argument to RepoError This use the same mechanism than Abort. Except clause stay distinct because RepoError add "!" at the end of the message.

test-revert: add revert --all case when nothing changed supposed to succeed without notice

merge with stable

color: be silent when falling back to ECMA-48 mode if "auto" mode was desired Don't warn about missing setab/setaf terminfo entries unless we explicitly asked for terminfo mode; fallback to ECMA-48 mode silently.

tests: hardcode terminfo entry for the terminfo color test For the terminfo color test, make sure that the terminfo entry used is one of our own choosing, by delivering a special "hgterm" entry (a copy of ncurses' xterm-color), compiling it, and specifically pointing curses to it using the TERMINFO and TERM environment variables. This means we can ignore the variability in different terminal definitions on different platforms.

localrepo: mark progress step for translation

revert: improve hints on abort when reverting to parent without --all BEFORE: $ hg revert abort: no files or directories specified (use --all to discard all changes) AFTER: Uncommitted changes (using --all *will* nuke edits): $ hg revert abort: no files or directories specified (uncommitted changes, use --all to discard all changes) Clean working directory (using --all won't discard anything): $ hg revert abort: no files or directories specified (use --all to revert all files)

dispatch: set config options on the request repo.ui

dispatch: return read config options

dispatch: set global options on the request repo.ui If the request has a repo, and global options such as --verbose are passed, we need to set those explicitly on the repo.ui.

cmdserver: assign repo.baseui before running commands There are places in the code that use localrepository.baseui (see hg.remoteui), we need the ui descriptors (and possibly other things) to be set correctly on it, so output written to the remoteui descriptors ends up at the right place. Before this change, tests such as 'test-bookmarks-pushpull.t' didn't work.

cmdserver: copy repo.ui before running commands

filemerge: use ui out descriptor when calling util.system

dispatch: make sure unspecified global ui options don't override old values