Merge with crew-stable

hgweb: make code to join url path simpler Now SCRIPT_NAME never contains http://host:port part, we don't need to care about '://'.

hgweb: fix broken URLs of RSS/Atom feeds (issue1772) This fixes doubled URL, e.g. http://example.orghttp://example.org/..., which appears on RSS/Atom feeds served by hgwebdir. It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME, according to RFC 3875. Updated the test output since SCRIPT_NAME becomes not to contain http://host:port part.

hgweb: introduce helper method to update req.env

rebase: always check if rebasing onto an applied mq patch. Previously, it only checked for an mq patch if the user explicitly passed -d/--dest. But rebasing onto an mq patch is a bad idea regardless of how we determine the rebase destination.

subrepo: wrap long line

merge with stable

test-extension: fix disabled extension tests for run-tests.py --local One test that requires inserting a broken extension into hgext does this by modifying PYTHONPATH. This doesn't work when run with --local because the 'hg' script being used is in the same directory as the local hgext. Instead of modifying PYTHONPATH, a secondary extension is enabled using --config that inserts the dummy hgext at the beginning of sys.path, before the script's path.

subrepo: print subrepo pulling URL

merge with stable