shelve: only save mq state if enabled Test coverage has been added.

changegroup: don't run changegroup hooks if nodes are gone The changegroup hook runs when the repo lock is released, but it's possible that multiple transactions have happened during that single lock and therefore the commits the hook was for may be gone. This is the case in the shelve extension where it adds a commit and strips it in the same lock but different transactions (which results in warning messages during unshelve on hgsubversion repos). A real fix would be to attach the hook to the transaction instead, but that might have unknown consequences. Since we're this close to code-freeze, this fix just prevents the hook from running if the commit disappeared.

hgweb: add escaping of tags and bookmarks in graph view

json: add more paranoid escaping

shelve: make no_backup parameter passing python 2.4 compatible Python 2.4 doesn't allow passing named parameter after an list unpack, but allows to unpack a dict.

ui: send password prompts to stderr again (issue4056)

hgweb: escape branch names in graph view

test: make test-propertycache.py python2.4 compatible The subprocess module have not `check_call` method in python2.4. Fall back to calling `check` with return code verification.

hgweb: log headers only if headers were successfully parsed The headers attribute is not initialized in certain error situations (e.g. http 400 bad request). Check for self.headers before we attempt to access it.

merge with stable

patch: Fix nullid for binary git diffs (issue4054) The index for an empty file in git is not 0, but sha-1("blobl 0\0").

shelve: copy bookmarks and restore them after a commit cmdutil.commit() will advance the bookmarks. Therefore we have to restore them afterwards. We have to use update() to ensure we preserve the bmstore object.

check-code: check that '>' is used for continued lines Continued lines do not get the SALT mangling.

check-code: check for spaces around = for named parameters

run-tests: place the .t shell script next to $TESTTMP and with a useful name --keep can thus keep it around - very convenient for debugging.

tests: fix void and invalid test in test-archive.t An echo statement was missed in the .t-ification in afe19a1bf9d3 so we ended up with invalid sh syntax. But at the same time a continuation line was marked as $ instead of > and we thus added the salt that made the expression valid again.

inotify: don't pass pidfile option to child The child no longer needs it.

cmdutil.service: move pidfile writing to the parent in daemon mode There is a potential race here, which I suspect I've spotted in the wild, where something reads the pid file after the parent exits but before the child has had a chance to write to it. Moving writing the file to the parent causes this to no longer be an issue.

cmdutil.service: move pidfile writing to a local function An upcoming patch will reuse this code.

inotify: add pidfile to parent options An upcoming patch will move pidfile writing from the parent to the child. This means that if the pid file isn't specified on the command-line but is specified as a config option, it needs to be added to the parent's opts dict.

get-with-headers: don't block indefinitely if the server had an internal error If the server had an internal error and returned 500, there's nothing to read, so "response.read()" blocks indefinitely. Only output the response if there's really a response.

convert: fix description of 'convert --rev'

convert: fix crash when existing converted revision didn't come from source This case can happen when converting from multiple repositories with filemap.

convert: fix crash when filemap filtering is changed