wix: bump MSI based installers to use Python 2.7 We're somewhat forced to use Python 2.7 for the bdist packages, so we might as well use 2.7 for the MSI installers as well.

merge with stable

tests: fix template test output

merge: handle case when heads are all bookmarks If all heads are bookmarks, merge fails to find what node to merge with (throws an IndexError while indexing into the non-bookmark heads list) as of 4a02cf4fbb2e. This catches that case and prints an error to specify a rev explicitly.

verify: do not choke on valid changelog without manifest Before this change: $ hg init $ hg branch foo $ hg ci -m branchfoo $ hg verify checking changesets checking manifests 0: empty or missing manifest crosschecking files in changesets and manifests checking files 0 files, 1 changesets, 0 total revisions 1 integrity errors encountered! (first damaged changeset appears to be 0) [1]

Merge

templater: abort when a template filter raises an exception (issue2987)

merge with stable

merge with i18n

i18n-ru: synchronized with c6f88e7f95b7

merge heads in stable

commit: normalize filenames when checking explicit files (issue3576)

test-status.t: test ui.slash on Windows

manifest: remove redundant sorted() call for --all repo.store.datafiles() is now already sorted (for all types of stores). A follow-up to 4cbb1137941d.

Merge from crew-stable

store: only one kind of OSError means "nonexistent entry"

store: sort the results of fncachestore.datafiles()

Merge with stable

fileset: fix generator vs list bug in fast path $ hg debugfileset 'a or b' would only return a or b but not both because the base file list was a generator instead of a replayable sequence.

debugfileset: implement --rev, more tests

test-fileset: test remaining predicates - exec - symlink - size - resolved / unresolved - subrepo

fileset: do not traceback on invalid grep pattern

fileset: matchctx.existing() must consider ignored files When running: $ hg debugfileset 'binary() and ignored()' getfileset() was correctly retrieving ignored files but matchctx.existing() was not taking them in account. Just add them along with unknown files.

fileset: matchctx.existing() must consider unknown files By default, unknown files are ignored. If the 'unknown()' predicate appears in the syntax tree, then they are taken in account. Unfortunately, matchctx.existing() was filtering against non-deleted context files, which does not include unknown files. So: $ hg debugfileset 'binary() and unknown()' would not return existing binary unknown files.

fileset: exclude deleted files from matchctx.existing() Running: $ hg debugfileset 'binary()' would traceback if there were one deleted file in the working directory. It happened because matchctx.existing() was filtering files against the ctx.__contains__() but deleted files are still considered part of workingctx.

test-fileset: test file status predicates

fileset: actually implement 'minusset' $ hg debugfileset 'a* - a1' was tracing back because 'minus' symbol was not supported.

tests: test filesets with test-fileset.t

merge with stable

rollback: write dirstate branch with correct encoding

Merge

templatekw: merge, preferring the second implementation

templatekw: add p1rev, p1node, p2rev, p2node keywords The {parents} template is cumbersome for some uses, as it does not show anything if there's only one "natural" parent and you can't use it to get the full 40 digit node hashes for parents unless you rely on the behavior of the --debug flag. Introduce four new template keywords: {p1rev}, {p2rev}, {p1node} and {p2node}. The "node" flavors of these always show full 40 digit hashes, but users can get the short version with a filter construction like '{p1node|short}'.

parsers: fix an integer size warning issued by clang

templatekw: add parent1, parent1node, parent2, parent2node keywords The {parents} template is cumbersome for some uses, as it does not show anything if there's only one "natural" parent and you can't use it to get the full 40 digit node hashes for parents unless you rely on the behavior of the --debug flag. Introduce four new template keywords: {parent1}, {parent2}, {parent1node} and {parent2node}. The "node" flavors of these always show full 40 digit hashes, but users can get the short version with a filter construction like '{parent1node|short}'.

Merge with crew-stable

revlog: don't try to partialmatch strings those length > 40 _partialmatch() does prefix matching against nodes. String passed to _partialmetch() actualy may be any string, not prefix only. For example, "e410be8603932e46a51298748a4b874739037fad or 300" is a good argument for _partialmatch(). When _partialmatch() searches using radix tree, index_partialmatch() C function shouldn't try to match too long strings.

merge with stable

merge with i18n

i18n-ru: fix spelling of "missing" equivalent

i18n-ru: synchronized with b131e24e2984

i18n-pt_BR: synchronized with b5c560787a4e

check-code: fix check for trailing whitespace on continued lines too The tests in test-annotate.t and test-import-git.t that relied on trailing space in a file created by a here string is now masked by a literal 'EOL' string that is removed.

check-code: fix check for trailing whitespace on empty lines It seems like the intention with c7d23b4ca4ba was to catch lines with only one whitespace too.

check-code: fix check for trailing whitespace on sh command lines The $ has been without necessary escaping since introduced in c7d23b4ca4ba.

Merge with stable

update: fix typo in help text Spotted by Kevin Chase <kevincha99@hotmail.com>

clone: don't fail with --update for non-local clones (issue3578) This was broken by 5884812686f7 due to lack of test coverage. This adds a test and fixes the defect.

merge with stable

merge with i18n

i18n-ru: synchronized with 474ae9720aa5

i18n-pt_BR: synchronized with e4db509c08ec

histedit, i18n: warn translators about edit command names

Merge with stable

histedit: sync docstring with edit comment The docstring should probably reuse the edit comment string instead.

templater: handle a missing value correctly Before, using a broken style such as: changeset = would result in a traceback. This fixes a regression introduced in 63c47e4ac617.

help/hgweb: fix spelling error

tests: remove stray test-convert-mtn-rename-directory.out

Merge with stable

context: simplify workingctx._parents

Added signature for changeset 7f5094bb3f42

Added tag 2.3 for changeset 7f5094bb3f42

test: fix typo in test comment

histedit: add proper locking around repair.strip() calls