largefiles: adjust localstore to handle batch statlfile requests (issue3583) This fixes a traceback when pushing to a local repo which started with 9e1616307c4c.

strip: fix revset usage (issue3604) The `repair` code builds a giant revset query instead of using the "%lr" idiom. It is inefficient and crash when the number of stripped changeset is too big. This changeset replaces the bad code by a better revset usage.

merge with i18n

i18n-ja: synchronized with 9d9d15928521

histedit: factored out diff/patch logic This patch is the first step towards a refactoring of the histedit extension to use underlying graft machinery instead of diff/patch as discussed in issue3527. Replacing diff/patch with graft is necessary to fix, for example, issue3582.

merge with stable

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