subrepo: use working copy of .hgsub to filter status (issue2901)

notify: remove unused url() method

test-notify-changegroup: test notifications on unbundle

run-tests: fix summary when accepting changes interactively Accepted changes were not counted as success.

merge with stable

verify: filter messages about missing null manifests (issue2900)

cmdserver: restore old working dir after dispatch when we have --cwd

dispatch: don't use request repo if we have --cwd

eol: ignore IOError from deleted files in commitctx A Mercurial repo signals a file is deleted by raising IOError when the file's data is requested. This IOError is normally caught by localrepository.commitctx. With the eol extension enabled and EOL mappings in place, the eolrepo subclass should ignore IOError because a deleted file has no line endings to process. This issue exhibited itself when performing an incremental hg convert of a revision with deleted files to a repo with an existing .hgeol file.

scmutil: add missing import of re see https://bitbucket.org/tortoisehg/thg/issue/929

dispatch: fix checking of rpath in _getlocal This avoids an extra config read

ui: rename _is_trusted to _trusted is and do are pointless, underbar separators are style violations

merge with stable

eol: fix silly test-gendoc breakage by escaping control characters

eol: document new eol.fix-trailing-newline setting

eol: fix missing trailing newlines in comitted files Some text editors (Eclipse, for example) do not add trailing newlines, so diffs often contain annoying "\ No newline at the end of file". This patch to eol extension simply adds trailing newline on commit.

eol: eol.only-consistent can now be specified in .hgeol

merge with stable

commands: use mergetoolopts when a command supports --tool

revsets: actually catch type error on tip^p1(tip) (issue2884) The previous commit was empty.

hgcia: Set default value of strip to -1 (issue2891) For backward compatibility the root path of the repository is not displayed unless the user has specified an explicit strip value.

commands: improve help for -y/--noninteractive Before, the help text said that Mercurial would assume 'yes' for all prompts, but this is confusing since many prompts don't have any 'yes' choice. It now more accurately describes what will happen.

bookmarks: simplify warning code

bookmarks: drop superfluous strip

bookmarks: add a warning for non empty malformed line

bookmarks: more robust parsing of bookmarks file

merge with stable

revsets: catch type error on tip^p1(tip) (issue2884)

revsets: do the right thing with x^:y (issue2884) Given an operator ^ that's either postfix or infix and an operator : that's either prefix or infix, the parser can't figure out the right thing to do. So we rewrite the expression to be sensible in the optimizer.

win32mbcs: wrap two more functions to be wrapped. util.checkwinfilename() and util.checkosfilename() are wrapped. The former, used by scmutil, is not friendly for Shift_JIS bytes. The latter is an dynamic alias of checkwinfilename() used by other modules.