bookmarks: set the current bookmark to the new name if we rename the current bookmark If we rename the current bookmark, we have to set the current bookmark to the new name.

merge with crew-stable

monoblue: add less/more links to graph page

python implementation of diffstat Implemented as two functions: diffstat, which yields lines of text, formatted as a usual diffstat output, and diffstatdata, which is called inside diffstat to do real performing and yield file names with appropriate data (numbers of added and removed lines).

add a comment about the need of hg._update()

merge with -stable

test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py Note that other sed replacement commands are also filtering get-with-headers.py, but they seem to be more test specific, hence not handled here.

Merge crew and stable

merge with stable

Merge with stable

merge with stable

color: fix colorization of the 'old mode' git diff metadata

merge with -stable

merge with crew-stable

merge with crew-stable (again)

merge with crew-stable

keyword: simplify repo.local and bundle check (as in 2f4a399a8787)

Merge with crew-stable

Added signature for changeset 3773e510d433

Added tag 1.1.1 for changeset 3773e510d433

resolve: clarify and simplify help

tests: fix no-diffs option

archive: fix bogus error message with no working directory

resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer

fix typo

hgweb: mq repos should be in non-recursive collections, too

tests: fix test-mq-qclone-http (broken by e60aaae83323)

hgweb: recurse down collections only if ** in [paths] collections: direct child repos only paths *: direct child repos only (like collections) paths **: recursive discovery When ** is used, the mq repository (if any) is also shown.

inotify: do not attempt to monkeypatch bundlerepos

Merge with crew-stable