merge with stable

subrepo: don't commit in subrepo if it's clean If a subrepo has changed relative to the outer repo's substate, but the subrepo itself is clean, we don't need to commit in the subrepo.

rebase: block collapse with keepbranches on multiple named branches (issue2112) Collapse and keepbranches should be blocked when there is more than one named branch on the branch that's going to be rebased.

merge with stable

hbisect: do not assume that min(good) is an ancestor of min(bad) The included test used to report "inconsistent state", which is incorrect. While this situation cannot occur when the user sticks to the suggested bisect sequence. However, adding more consistent good/bad information to the bisect state should be tolerated as well.

hbisect: more consistent variable name

hbisect: confine loop to the relevant interval In this context we know that ancestors[rev] == None for all rev <= goodrev, so looping further back is unnecessary (and confusing).

win32: assign winstdout to sys.__stdout__ as well (issue2888) On Windows sys.stdout was being replaced with winstdout, which caused util.system() to redirect its output (due to 406b6d7bdcb9). That causes interactive tools (such as vim) to stop working.

alias: note interaction of shell aliases with early opts in help

alias: fix up test results

hooks: redirect stdout/err/in to the ui descriptors when calling python hooks We need to make sure that python hooks I/O goes through the ui descriptors so it doesn't mess the command server protocol.

alias: pass local ui to shell alias This avoids an additional config read

aliases: drop cwd manipulation Already done in _dispatch

dispatch: move shell alias handling after early arg handling --cwd, --repo, and --config obviously should be handled first

merge with stable

rebase: reset bookmarks (issue2265 and issue2873)

merge with stable

cmdserver: take repo.baseui as our ui The ui passed to server() is really repo.ui, that is it contains its local configuration as well. When running commands that use a different repo than the servers cached repo, we don't want to use that ui as the baseui for the new repo.

web: Output a correct date in short format (issue2902)

test-commandserver: explicitly close opened file

verify: fix mq misfire

merge with stable

merge with i18n

i18n-pt_BR: synchronized with 35f5cfdd0427

merge with stable

commit: suppress spurious new head message for duplicate commit (issue2893)

osutil: emulate os.listdir's OSError for long names (issue2898)

verify: filter messages about missing null manifests (issue2900)

merge with crew

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.

commands, merge: call setconfig on the right ui In practice this doesn't change anything since ui == repo.ui here, but setting repo.ui explicitly here is clearer since hg.merge will use repo.ui later on.

peer: change arg name to convey it can be a repo as well

progress: add a changedelay to prevent parallel topics from flapping (issue2698) When combined with the earlier change to make the progress object truly a singleton, this prevents the progress bar swapping on 'hg clone --pull' on a local filesystem. Thanks to timeless for lots of debugging help at the Copenhagen sprint to isolate the root cause of this and a first draft an idea that would fix it.

progress: make progress bar a singleton to avoid double-progress ui bugs This helps issue2698 a little, but isn't a complete fix, since generators still can produce some weird progress bar switching.

progress: remove superfluous parens