wireproto: use proper UTF-8 handling for key lookup Lookups happen in the local encoding space, but the wire protocol should be using UTF-8 for interoperability.

bookmarks: use UTF-8 storage This uses tolocal/fromlocal to translate bookmark metadata to UTF-8 for storage. Existing bookmarks in ASCII, UTF-8 or Latin1 will continue to work, others may need to set HGENCODINGFALLBACK to transition.

branch: operate on branch names in local string space where possible Previously, branch names were ideally manipulated as UTF-8 strings, because they were stored as UTF-8 in the dirstate and the changelog and could not be safely converted to the local encoding and back. However, only about 80% of branch name code was actually using the right encoding conventions. This patch uses the localstr addition to allow working on branch names as local strings, which simplifies handling so that the previously incorrect code becomes correct.

encoding: add localstr class to track UTF-8 version of transcoded strings This allows UTF-8 strings to losslessly round-trip through Mercurial

Merge with stable

wix: allow x86 MSI packages to be installed on x64 systems

Merge with stable

wix: add support for x64 native MSI packages

wix: switch Mercurial Windows installer to use py2exe --bundle 3 --bundle 3 leaves all of the compiled C extensions and other DLLs outside of the library.zip, so we no longer add the installer folder to the system PATH. Instead, we now ship a small bin/hg.cmd and it is placed in the PATH. Switching to py2exe --bundle 3 is necessary because the higher bundle options are not supported on x64.

Merge with stable

util.datestr: do not crash on revisions with negative timestamp (issue2513) Python's time.gmtime(lt) fails on Windows, producing a traceback with ValueError: (22, 'Invalid argument') if lt < -43200. We get a local time boundary value of -43200 if we take "the epoch" Thu Jan 01 00:00:00 1970 = time.gmtime(0) from timezone 'UTC+0' into timezone 'UTC-12'. All other timezones will have larger local time values for that point in time. Aborting with a traceback on 'hg log' for revisions with a timestamp value < -43200 is clearly not acceptable. Returning "invalid timestamp" or similar as string representation is not an option either, since that may crash other tools which parse the output of 'hg log'. Instead, we teach util.datestr() to return the epoch in timezone UTC+0 on *all platforms*, represented by the string Thu Jan 01 00:00:00 1970 +0000 if the timestamp's unix time value is negative. (based on a patch originally proposed by Benjamin Pollack)

checknlink: return False if .hgtmp file preexists (issue2517) If os_link fails on Windows, errno is always errno.EINVAL, so we can't really say if the testlink could not be created because (a) the FS doesn't support hardlinks or (b) there is a leaked .hgtmp file lying around from a previous crashed run. So let's err on the safe side, keep the code simple and assume we can't detect hardlinks in both cases.

localrepo: move string formatting out of gettext call

merge with stable

mq: ignore subrepos (issue2499) If MQ allows modifying .hgsub or .hgsubstate in a patch, it can easily lead to an inconsistent subrepo state. This patch prevents qrefresh from adding any modifications to .hgsub or .hgsubstate to a patch. The user is warned that these files are not included in the patch. The tests test both the slightly irrational and the pathological cases.

tests: integrate test-hardlinks-safety.t into test-hardlinks.t Should make running the testsuite a bit faster. Also, test-hardlinks.t and test-hardlinks-safety.t now have enough infrastructure in common.

mq: add an '-e/--exact' option to qpush This patch adds an '--exact/-e' option to qpush that will try to push the patches in the correct location in the DAG. Specifying this option does the following: * If --move is specified, abort. It makes no sense to move a patch to the front of the queue and try to apply it to its parent, because its parent is one of the patches we just moved it in front of! * If patches are already applied, abort. We don't want patch changesets scattered throughout the DAG. * If local changes are present, abort unless --force is used, as usual. * Find the first patch we're going to push (if we're pushing multiple patches with a target or --all). * If that patch doesn't have a parent, abort, obviously. * If the parent doesn't exist in the repo, abort. Something is wrong. * Update to the parent, then continue pushing the patches as normal.

dirstate: warn on invalid parents rather than aborting This allows more graceful recovery from some mangled dirstates

code style: prefer 'is' and 'is not' tests with singletons

polib: remove unnecessary comparisons with True Submitted to upstream repository as changeset f11e0b1b37b0.

subrepo: lazier git push logic Avoids calls to git push when the revision is already known to be in the remote repository. Now, when using a read-only git subrepo, git will never need to talk to its upstream repository.

merge with stable

subrepo: archive git subrepos

check-code: catch Python 'is' comparing number or string literals The Python 'is' operator compares object identity, so it should definitely not be applied to string or number literals, which Python implementations are free to represent with a temporary object. This should catch the following kinds of bogus expressions (examples): x is 'foo' x is not 'foo' x is "bar" x is not "bar" x is 42 x is not 42 x is -36 x is not -36 As originally proposed by Martin Geisler, amended with catching negative numbers.

keyword: s/config/configuration/ in help

Merge with stable

record: quote command in use hg commit message

revert: improve merge advice and favor its error over all

rebase: support --detach when null is common ancestor

templater: fix variable name 'format' was renamed to 'parsed' in 0d50586a9d31