merge: make 'nothing to merge' aborts consistent Makes the 'nothing to merge' abort messages in commands.py consistent with those in merge.py. Also makes commands.merge() and merge.update() use hints. The tests show the changes.

merge: remove excess creation of changectx

largefiles: optimize performance of status on largefiles repos (issue3136)

Describe all files related to the standard commands.

branch: warn on branching

bookmarks: mark divergent bookmarks with book@pathalias when source in [paths]

bookmarks: shadow divergent bookmarks of foo with foo@n

help: properly underline annotate config heading

merge with stable

branch: move note about permanence to the top, add 'global'

util: fix url.__str__() for windows file URLs Before: >>> str(url('file:///c:/tmp/foo/bar')) 'file:c%3C/tmp/foo/bar' After: >>> str(url('file:///c:/tmp/foo/bar')) 'file:///c%3C/tmp/foo/bar' The previous behaviour had no effect on mercurial itself (clone command for instance) because we fortunately called .localpath() on the parsed URL. hgsubversion was not so lucky and cloning a local subversion repository on Windows no longer worked on the default branch (it works on stable because de7e2fba4326 defeats the hasdriveletter() test in url class). I do not know if the %3C is correct or not but svn accepts file:// URLs containing it. Mads fixed it in de7e2fba4326, so we can always backport should the need arise.

convert: tolerate trailing spaces on map files A convert run with a branchmap made with echo default namedbranch > branchmap on Windows fails silently and surprisingly; it actually adds a space after 'namedbranch', so it ends up mapping "default namedbranch" to "". This also affects splicemaps, since the same parser is used for both.

test-svn-subrepo: fix reference output for svn 1.7 I modified check-code.py "$?" detection because I thought my use was legit, we cannot test exit status of pipelines commands except for the last one without this. So it now tolerates "[$?" which is unlikely to be added by mistake. Tested on: - OSX + svn 1.7.1 - Linux + svn 1.6.12

convert: simplify getargmax() with propertycache

convert/svn: update svn working copy only when necessary I have not tried to produce the bug but here is idea: f85c0034a062 stopped passing the modified files list to commit. This makes commit more fragile since we better not touch unrelated files by mistake. But putcommit() still applies file changes before exiting upon ignored revisions. So in theory, we could apply changes from a skipped branch then commit them as part of another revision. This patch makes the sink apply the changes after possibly skipping the revision. The real fix would be to use svn commit --targets option to pass the file names in an argument file. Unfortunately, it seems to be bugged in svn 1.7.1: http://svn.haxx.se/dev/archive-2011-11/0211.shtml

rollback: always call destroyed() (regression from 1.9) The contract for repo.destroyed() is that it is called whenever changesets are destroyed, either by strip or by rollback. That contract was inadvertently broken in 7c26ce9edbd2, when we made a chunk of code conditional on destroying one of the working dir's parents. Oops: it doesn't matter *which* changesets are destroyed or what their relationship is to the working dir, we should call repo.destroyed() whenever we destroy changesets.

merge with stable

Added signature for changeset 195dbd1cef0c

Added tag 2.0.1 for changeset 195dbd1cef0c

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