alias: shortcut command matching show shadowing works properly (issue3104) An alias for 'log' was stored in the same command table as '^log|history'. If the hash function happens to give the latter first, the alias is effectively ignored when matching 'log'.

convert/svn: fix URL quoting issue with svn 1.7 As of svn 1.7, many svn calls expect "canonical" paths. In theory, we should call svn.core.*canonicalize() on all paths before passing them to the API. Instead, we assume the base url is canonical and copy the behaviour of svn URL encoding function so we can extend it safely with new components.

largefiles: fix rename (issue3093)

bundlerepo: don't write branch cache to disk Calling branchmap() or similar on a bundlerepo would write the bundle-augmented branch cache to disk, requiring a subsequent expensive rebuild when the repo is used without the bundle.

merge with stable

revset: balance %l or-expressions (issue3129)

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 10a4fab20ed9

merge with stable

clone: get all bookmarks before updating

lock: change name of release chain

localrepo: remove asserts in _afterlock

localrepo: rename _postrelease to _afterlock

addchangegroup: ony queue hooks when we have changesets

addchangegroup: remove the lock argument on the addchangegroup methods This argument is no longer require. post lock release code is now handled with dedicated post release callback code in lock itself.

addchangegroup: use a postrelease callback to call changegroup hook This is will allow addchangegroup to drop lock related code.

lock: add mechanism to register post release callback

diff: '\ No newline at end of file' is also not part of the header Diff containing '\ No newline at end of file' were colorized incorrectly.

ssh: quote remote paths (issue2983)

id: add command line options for handling ssh and https urls

largefiles: use "ui.configlist()" to get largefiles.patterns configuration current lfconvert implementation uses combination of "ui.config()" and "str.split(' ')" to get largefiles.patterns configuration. but it can not handle multiline configuration in hgrc files correctly. lfconvert should use "ui.configlist()" instead of it, as same as override_add does.

status: support revsets with --change

merge with stable

largefiles: avoid use of uinitialized variable in case of errors

tests: remove unstable debugstate output in test-largefiles.t

largefiles: simplify lfutil.writehash This was unnecessarily verbose: there is no need to unlink the file when we open it for write anyway, and there is no need to check if the file exists after we created it.

merge with stable