Merge with stable

extensions help: make disabling example analogous to enabling example The example for enabling an extension in the module search path is: foo = foo can only be disabled by: foo = ! and not by: hgext.foo = ! As the examples now omit "hgext." the example hgext.bar = ! is misleading.

test-help: improve test coverage Adds a test for using the help option with the version option. Extends test coverage of commands.help_ by another 2 lines.

setup: ignore 'not importing' warnings during version detection Python will issue an ImportWarning when seeing 'import locale' if there is a locale/ directory present without a __init__.py file. The warning is silent by default, but it somehow shows up anyway on Windows when setup.py executed hg. The warning causes runcmd to panic since it sees output on stderr. This patch ignores warnings on stderr about not importing a package.

tests: load with "ext =" instead of "hgext.ext ="

Merge with stable

keyword: go into restricted mode when transplanting Expanded keyword is read into diff with transplant -b otherwise. Test this scenario. Thanks to Adam Berkes for providing an example case.

keyword: do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.

merge with default

mq: qnew -f should reject merge working directories

Merge with stable

hgext: enable extensions without "hgext." prefix in help texts

cmdutil: replace sys.maxint with None as default value in loglimit Semantically, it is better to use None over any other value when there is "no value". Using maxint in this context is quite hackish, and is not forward compatible.

test-help: improve test coverage Adds a test for displaying the short list of commands with the verbose option i.e. 'hg -v help shortlist'. Extends test coverage of commands.help_ by 2 lines.

bookmarks: move parse() and current() into property definitions

bookmarks: refactor code responsible for updates of bookmarks introduce _bookmarksupdate for common parts from commitctx and addchangegroup

bookmarks: repo._bookmarkcurrent should be a propertycache

bookmarks: write() can simply access repo._bookmarks

bookmarks: turn repo._bookmarks into a propertycache

Merge with stable

hook: fix bug (reuse of variable) introduced in 872d49dd577a For binary installs, the 'name' argument would be reused as a local variable, destroying its original value. The patch fixes that, and also avoids copying sys.path when it's not necessary.

patch: implement patch.eol=auto mode EOLs in patched files are restored to their original value after patching. We use the first EOL found in the file, files with inconsistent EOLs will thus be normalized during this process.

patch: propagate eolmode down to patchfile The old code mapped the value of eolmode ('strict', 'crlf' or 'lf') to eol (None, '\r\n' or '\n') at the entry point in internalpatch. The value of eol was then used directly as the desired EOL in patchfile. We now delay the mapping and let patchfile do it instead. This allows for more complicated behavior where it does not make sense to map eolmode directly to the target EOLs.

Merge with stable

share: use defaultdest to compute unspecified destination This harmonizes with clone, and avoids creating a .hg in the current directory if the source ends with a /

Merge with stable

glog: fix "incompatible option" error message. Options like 'only_branch' should be presented to the user as '--only-branch'.

Merge with crew