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