merge with stable

eol: fix silly test-gendoc breakage by escaping control characters

eol: document new eol.fix-trailing-newline setting

eol: fix missing trailing newlines in comitted files Some text editors (Eclipse, for example) do not add trailing newlines, so diffs often contain annoying "\ No newline at the end of file". This patch to eol extension simply adds trailing newline on commit.

eol: eol.only-consistent can now be specified in .hgeol

merge with stable

commands: use mergetoolopts when a command supports --tool

revsets: actually catch type error on tip^p1(tip) (issue2884) The previous commit was empty.

hgcia: Set default value of strip to -1 (issue2891) For backward compatibility the root path of the repository is not displayed unless the user has specified an explicit strip value.

commands: improve help for -y/--noninteractive Before, the help text said that Mercurial would assume 'yes' for all prompts, but this is confusing since many prompts don't have any 'yes' choice. It now more accurately describes what will happen.

bookmarks: simplify warning code

bookmarks: drop superfluous strip

bookmarks: add a warning for non empty malformed line

bookmarks: more robust parsing of bookmarks file

merge with stable

revsets: catch type error on tip^p1(tip) (issue2884)

revsets: do the right thing with x^:y (issue2884) Given an operator ^ that's either postfix or infix and an operator : that's either prefix or infix, the parser can't figure out the right thing to do. So we rewrite the expression to be sensible in the optimizer.

win32mbcs: wrap two more functions to be wrapped. util.checkwinfilename() and util.checkosfilename() are wrapped. The former, used by scmutil, is not friendly for Shift_JIS bytes. The latter is an dynamic alias of checkwinfilename() used by other modules.

commands, merge: call setconfig on the right ui In practice this doesn't change anything since ui == repo.ui here, but setting repo.ui explicitly here is clearer since hg.merge will use repo.ui later on.

peer: change arg name to convey it can be a repo as well

progress: add a changedelay to prevent parallel topics from flapping (issue2698) When combined with the earlier change to make the progress object truly a singleton, this prevents the progress bar swapping on 'hg clone --pull' on a local filesystem. Thanks to timeless for lots of debugging help at the Copenhagen sprint to isolate the root cause of this and a first draft an idea that would fix it.

progress: make progress bar a singleton to avoid double-progress ui bugs This helps issue2698 a little, but isn't a complete fix, since generators still can produce some weird progress bar switching.

progress: remove superfluous parens

keyword: reuse already present working contexts for match Shortens overlong line as side-effect.

merge with stable

discovery: quiet note about heads This was changing output on in/out -v for no good reason.

patch: fix parsing patch files containing CRs not followed by LFs Since 1e64e1e12195 , patch lines containing a CR not followed by a LF would be incorrectly splitten, causing a failure to apply the patch.

treediscovery: rename stop() in tests to fix failures on AIX. It seems ksh, the default shell on AIX, does not permit the creation of a function called stop(). test-treediscovery.t and test-treediscovery-legacy.t both fail on AIX with error 'syntax error at line 25 : `(' unexpected'. Fix by renaming stop() in the scripts to tstop(). For completeness rename start() to tstart() to match. Both tests then pass on AIX. Add check for the use of stop() in a shell script to check-code.

fileset: fix typo in binary() doc

help: fileset foo.lst was named files.lst

merge with stable

Added signature for changeset de9eb6b1da4f

Added tag 1.9 for changeset de9eb6b1da4f

util: rename the util.localpath that uses url to urllocalpath (issue2875) util is never imported by any other name than util, so this is mostly just a simple search and replace from util.localpath to util.urllocalpath (assuming other uses of util.localpath already has been renamed).

tests: restore previous fix for date ambiguity in cvs test 017ab404e588 changed some sleeps after cvs update to sleeps before commit. I don't know why that should work, but I have a machine where it doesn't work. Commits regularly fails becuase cvs doesn't notice that a file has been changed. Restoring the previous sleep between the update and the edit makes cvs notice the change.

merge with stable

run-test: revert most of 439ed4721a6d, timeout uses fallback for terminate()

run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()

subrepo: correct revision in svn checkout A Subversion subrepo checkout uses a url and --revision which does not do the correct thing when specifying a revision of a branch that has since been deleted and recreated. The checkout needs to specify the revision as URL@REV instead.

wix: catch up with more added files revsets: 1.7::tip and adds("mercurial/help/**") 1.7::tip and adds("mercurial/templates/**")

i18n-pt_BR: translate template filter descriptions

i18n-ja: recover template translations from 15200b46165b These translations were removed by 68a697421a57 because the original strings were transfered to the docstrings (264f292a0c6f) without the corresponding sources being added to the Makefile for extraction.

i18n-ru: fixed mixed up msgid and msgstr in annotate

i18n-ru: translated missing strings for commands, some typos corrected

i18n-pt_BR: synchronized with 9adce4b38ed1

merge with stable

merge with i18n

i18n-ja: synchronized with 5c046e4b9652

i18n-ru: translated help for urls. Thus, all stock commands and help translated

i18n-ru: translated help for templating

i18n-sv: synchronized with 85857aa6e666

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