dispatch: avoid double backslashes in error message The use of %r in the format string caused Python to display Windows paths with double backslashes.

hgweb: add a "web/logoimg" setting to customize the web logo image This change complements the existing web/logourl setting, and lets the user customize the logo image that is shown on many of the hg server pages. If this setting is not set, hglogo.png is used.

util: move windows and posix wildcard imports to begin of file

util: move "default" hidewindow to posix.py There is a hidewindow in win32.py, which we get via windows.py

util: move "default" lookupreg to posix.py There is a lookupreg in win32.py, which we get via windows.py

util: move "default" unlinkpath to posix.py we have a unlinkpath in windows.py

util: move "default" makedir to posix.py makedir is already defined in win32.py, which gets imported into util.py via windows.py if we are running on Windows

summary: allow color to highlight active bookmark

summary: show bookmarks separate from tags and note active mark (issue2892)

localrepo: make requirements attribute of newly-created repos contain a set This is for internal consistency, as this attribute typically contains a set

localrepo: fix comment on set

revert: restore check for uncommitted merge (issue2915) (BC) This will restore the pre-1.9 behavior.

localrepo: add set method to iterate over a given revset This should allow replacing a number of hand-rolled graph algorithms.

revset: add formatspec convenience query builder

revset: allow bypassing alias expansion For internal usage of revset queries, we don't want aliases breaking things.

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