bookmarks: discard current bookmark if absent from the bookmarks (issue2692) After a rollback, the current bookmark might be absent from the bookmarks file. In that case we discard it instead of displaying a traceback during commit.

fix test-highlight after bookmark support change for hgweb

merge with stable

eol: do not abort when win32text is found, only warn The win32text extension does not break eol or vice-versa, so it is not a fatal error to have both of them enabled. It's just folly. So spewing warnings in this condition is preferrable to aborting. When both extensions are enabled, the user now sees: % hg st the eol extension is incompatible with the win32text extension win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension M hgext/eol.py

merge with stable

tests: fix failures introduced in 7359cb753a54

tests: fix permission issue trying to remove test directory

bookmarks: fix update of the current bookmark during rename We need to get rid of the previous bookmark after changing current bookmark.

setup: remove unnecessary code for win32com (pywin32)

test-highlight: fix test output (introduced by 2151703e7f84)

eol: rename hook into checkheadshook, add checkallhook (issue2665) "hook" is still an alias for "checkheadshook".

eol: make the hook check all new heads, not only tip (issue2666) Report and test by Antoine Pitrou <solipsis@pitrou.net>

eol: the hook no longer requires the extension to be loaded Reading rules in the hook means we no longer need ui to be filled and do not need reposetup() to be run anymore.

eol: extract parsing error handling in parseeol()

eol: separate .hgeol parsing from merge in ui This will help refactoring the hook.

eol: remove unused argument in readhgeol()

eol: explain why reading .hgeol from the working dir is special

templates: widen the graph canvas (issue2683)

rebase: don't use util.Abort for an internal error

help: limit documentation width to at most 80 characters Reading long lines is suboptimal no matter how wide the terminal is.

merge with stable

transplant: avoid the word "rebase" when we mean "transplant"

transplant: explain that changesets are copied, not moved

hg: add support for cloning bookmarks

httprepo: use caps instead of between for compat check We usually query the capabilities at some point anyway so this way the first roundtrip actually does useful work.

revset: add a revset command to get bisect state.

bisect: new command to extend the bisect range (issue2690) When bisect ends in a merge point, and one of the parent wasn't checked, this usually means the culprit is in a branch that wasn't scanned. For this case we provide a new command which extends the range of the bisect search to the common ancestor of the parents of the merge.

hgweb: pmezard thinks one default is enough