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