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