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