merge with stable

push/outgoing: print remote target path even if there's an error (issue2561) This is a simple patch to make hg push/hg outgoing print their remote target path even if the operation fails. I'm not sure if the original behavior was by design. This patch also changes one test to reflect the changed behaviour.

subrepo: recognize scp-style paths as git URLs

convert: add svnrev, svnpath and svnuuid template keywords $ hg -R A-hg log --template '{rev} {svnuuid}{svnpath}@{svnrev}\n' 10 644ede6c-2b81-4367-9dc8-d786514f2cde/trunk@10

convert/svn: extract revsplit() in a function

transplant: add "transplanted" keyword $ hg log --template '{rev} {transplanted}\n' 7 a53251cdf717679d1907b289f991534be05c997a

merge with i18n