obsolete: import modules within mercurial/ without "from mercurial"

test-hybridencode: add cases for com0..9 and lpt0..9 note that com0 and lpt0 are *not* encoded

zsh completion: tweak options for `incoming`, `outgoing` and `rebase` * `incoming --rev` completes _hg_labels, not jsut tags; * `outgoing --rev` completes revrange; * source/dest/base for `rebase` require argument.

zsh completion: update mq commands completion * add qclone command; * qapplied/qunapplied: add --last/--first; * qdiff: add all diff options; * qfold: add --force, --no-backup; * qgoto: add --keep-changes; * qimport: add --git, --push; * qnew: add user- and date-related options; * qpop/qpush: add --keep-changes and --no-backup, drop --name; * qpush: drop deprecated --merge; * qrename: complete only unapplied patches' names; * strip: add --rev, --keep, --bookmark, update descriptions, drop --backup.

zsh completion: add new options for existing commands * backout: add --tool; * bisect: add --extend; * bookmarks: add --inactive; * branches: add --closed; * bundle: add --rev, --all, --branch; * cat: add --decode; * clone: add --updaterev, --branch, --pull and use common-with-qclone opts; * commit: add --close-branch; * diff: add --change, --reverse, --stat, --text, --unified; * export: add --rev; * grep: add --date; * heads: add --topo, --closed; * help: add --extension, --command, --keywords; complete additional help topics also, not commands only; * identify: add --bookmark and remote_opts; * import: add --no-commit, --exact, --import-branch, --date, --user, --similarity and commit options; * log: add --user, --date, --stat, --git, --graph; * manifest: add --rev; * push: add --new-branch; * resolve: add --all, --no-status, --tool and pattern options; * revert: add --date; * serve: add --prefix, --web-conf, --pid-file, --cmdserver, --certificate; * status: add --change; * tag: add --force, --edit, --remove; * tip: add --git; * update: add --check, --date.

zsh completion: add support for convert, graphlog, purge, record extensions

zsh completion: add subrepos options for all supporting commands

zsh completion: add new option groups for options Add clone, date/user, git-style, merge tool, ignore space, log, branch/bookmarks options and use them throughout command completions.

zsh completion: add `forget` and `rollback` commands

zsh completion: complete additional topics for `help`, not commands only

Merge with stable

tests: merging bookmarked heads 45b5eb2941d0 fixed an error that occured when heads being merged were both inactive bookmarks. Add a test for that case.

merge with stable

debuginstall: show directory for Python lib Example new output on Windows: $ hg debuginstall checking encoding (cp1252)... checking Python lib (C:\Users\adi\hgrepos\hg-main\hg-python\lib)... checking installed modules (C:\Users\adi\hgrepos\hg-main\mercurial)... checking templates (C:\Users\adi\hgrepos\hg-main\mercurial\templates)... checking commit editor... C:\Program Files (x86)\Notepad++\notepad++.exe checking username... no problems detected on Linux: adi@kork-ubuntu64:~/hgrepos/hg-main$ ./hg debuginstall checking encoding (UTF-8)... checking Python lib (/usr/lib/python2.7)... checking installed modules (/home/adi/hgrepos/hg-main/mercurial)... checking templates (/home/adi/hgrepos/hg-main/mercurial/templates)... checking commit editor... checking username... no problems detected

util: replace util.nulldev with os.devnull Python since 2.4 has supported os.devnull so having util.nulldev is unnecessary.

revset: add hidden() revset

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