diff: make diff -c aware of revision sets

color: wrap lines in docstring

merge with stable

setup: fix mac build broken by e42d18538e1d Sometimes xcodebuild prints warnings to stderr, but runcmd() assumes anything printed to stderr implies failure. Since runcmd() was originally only intended to run hg, this was fine until it was pressed into service for running xcodebuild. Thus: split runcmd() into two parts: runcmd(), which does the minimal amount of work to run a subprocess, and runhg(), which calls runcmd().

color: don't mention internal function in docstring The render_text function actually never existed, the docstring probably meant the render_effects function instead.

keyword: offer additional datefilters when the extension is enabled Before the additional datefilters (utcdate, svnisodate, svnutcdate) were used when kwtemplater was initialized. Now they always be used once the extension is enabled.

keyword: docstrings for additional date filters

mq: do not let qrefresh write bad patch

graphlog: give meaningful error if more than one file is given

merge with stable

test-https: update to match output from 3f6a4579f803

tests: respect new hg clone listkey queries in http-proxy test

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

don't depend on features of Exception as much BaseException.message has been deprecated, so we try to not rely on it.

deal with empty Content-Length headers

hgweb: add separate page with bookmarks listing

hgweb: add display of bookmarks for changelog and changeset

merge with stable

setup.py: use StrictVersion instead of manual comparison

help: extract items doc generation function

templates: document missing keywords or filters Keywords keywords are not documented yet but are turned into function definitions to avoid lambda docstring weirdness.

templatefilters: move doc from templates.txt to docstrings

templatefilters: wrap all filters in dedicated functions This will highly simplify the docstring integration. I measured "hg log --style=changelog" duration on mercurial itself and could not detect any difference.

templatefilters: prefix helper functions

templatefilters: sort function definitions

templatefilters: match filter keys and function names

templatefilters: sort filters table

templates: generate keyword help dynamically

test-help: test a sample of 'templates' topic help

fix compiling of extensions for OS X and XCode 4.0

test-subrepo-paths: fix typo

eol: use dirstate methods to clear dirstate This fixes a race that was observed when status was called before and after clearing the dirstate.

tests: fix permission issue trying to remove test directory

transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command Sometimes it is necessary to know the original revision ID in order to correctly rewrite the patch or commit message when transplanting. This patch follows the pattern set by the existing 'HGUSER' environment variable, and adds a test that covers both HGUSER and HGREVISION.

test-subrepo-paths: test cummulative remapping

merge with stable

ui: yield unchanged values in walkconfig Ever since walkconfig was introduced back in 25e7ea0f2cff, the values yielded has been mutated by replacing "\n" with "\\n". This makes walkconfig less useful than it could and there is no other way to iterate over all config sections. The third-party reposettings extension used ui.walkconfig but did not take the replacement into account -- this change will actually fix a bug in the extension when a value contains a newline.