contrib: some support for named branches in zsh_completion (issue2988) named branches were not included for autocompletion in zsh. by adding _hg_branches and calling it from _hg_labels, named branches are now included when autocompleting many commands in zsh. support for completion of hg log -b was also added. there are possibly other cases where support needs to be explicitly added.

test: test for options duplicate with global options issue2995 should not happen anymore

merge with stable

rollback: improve readability; clarify that the return value is an int.

demandimport: determine at load time if __import__ has level argument

win32: quietly ignore missing CreateHardLinkA for Wine

osutil: avoid accidentally destroying the True object in isgui (issue2937) Needed to use 'Py_RETURN_TRUE' instead of 'return Py_True' to avoid reference count errors which would randomly crash the Python executable during merge. This only happened when you had something configured in merge-tools and the merge was large enough.

merge with stable

merge

bundlerepo: add argument check before unlink The default argument value of None, for bundlename, would cause an exception. Callers currently pass an empty string, thus dodging this problem.

test-setdiscovery: allow for leading space in output of wc

merge with stable

ui: write traceback to self.ferr

mq: split up overly long line

patch: handle 'gitpatches' being empty, but not none

mq: don't suppress patch tracebacks when applying patches

test-setdiscovery.t: portability fix The output of 'wc -c' is prefixed with spaces when using BSD wc.

keyword: use wopener(..., atomictemp=True) to overwrite

share: drop unused import

merge with stable

test: test unshare command

hgext: introduce unshare command

hg: extract copying the store out of clone

url: Remove the proxy env variables only when needed (issue2451) This is an attempt to fix issue 2451 and its duplicates (2599 and 2949, AFAIK). Its main idea is that it is only necessary to clean the proxy environment variables *when* http_proxy is set in the config file (since it takes precedence over the environment variables). Otherwise, hg shouldn't bother with them, since they will most likely be used to reach the server.