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

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

largefiles: copy files into .hg/largefiles atomically Copying from the user cache into .hg/largefiles could fail halfway though with a partially written file.

largefiles: write .hg/largefiles/ files atomically Before, it was possible to create a .hg/largefiles/hash file with truncated content, i.e., content where SHA-1(content) != hash This breaks the fundamental invariant in largefiles that the file content for files in .hg/largefiles hash to the filename.

largefiles: add comment about non-atomic working directory When updating the working copy with a normal 'hg update', we also don't use atomic writes.

tests: use an alias to make msys 'pwd' return paths with forward slashes

tests: skip cvs tests with msys on windows They will fail with weird 'ssh' errors.

tests: introduce 'hghave msys' to skip tests that would fail because of msys

merge with stable

convert: handle trailing slashes in filemap better (issue3124)

tests: remove test-casecollision-i18n.t The result of this test is quite suspect. Remove it for now as it now correctly breaks on HFS+.

posix: fix HFS+ percent-encoding folding We use 'ignore' rather than 'replace' so we don't have to deal with u+FFFD in UTF-8 round-trip.

mail: use quoted-printable for mime encoding to avoid too long lines (issue3075) Quoted-printable was already used for the more critical patch mails, so it should be fine for everything else as well.

notify: add option for writing to mbox This makes it possible to test how the mails that are sent _really_ look like.