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