wix: pre-check the 'I approve this license' checkbox This is simply a convenience to the user, they can click next until the installer goes away. Optimally, the checkbox would be hidden or removed, but that requires rewriting the UI.

Merge with stable

addremove: avoid fetching data again and again

addremove: add progress support for similarity search

addremove: atomically update the dirstate In case someone hits ^C during the similarity search, properly rollback

inotify: expose the same dirstate.status() interface as dirstate. The real dirstate.status() does not have any keyword args. For consistency, wrappers or subclasses should not have them either.

keyword: remove spurious locks, improve handling of wlock - kwcommitctx is inside the wlock of repo.commit: no lock - _kwfwrite only needs wlock wlock outside try block, so we don't need to import lock.release _kwfwrite should even be safer that way, as we moved the status call inside the try-except block. Thanks to Benoit Boissinot for help.

keyword: use status' names instead of index

hgweb/graph: edge should be same color as the destination

templatefilters: store the agescales in reverseorder directly

hgweb: separate generation of entries and sorting (cleanup)

Merge stable

demandimport: add __main__ to the blacklist (because of setuptools)

bookmarks: add invalidate() to bookmark_repo Cached bookmark information would not be reset when repo.invalidate() was called, meaning (for instanced) guis would be left with out-of-date bookmark info. This patch fixes that by overriding bookmark_repo.invalidate()

branch: help misuse of hg branch to switch branches Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of 'hg update EXISTING_BRANCH' as me. If so, let's help them to use 'update'. Also removed '(use --force to override)' because it can mislead them.

Make Readme.html reference current OS X release

progress: clear progress before writing to stderr

Added signature for changeset ff2704a8ded3

Added tag 1.5 for changeset ff2704a8ded3

mq: drop -Q in favor of --mq only

mq: correct test output

mq: disallow : in patch names (issue2065)

mq: disallow # (and : on Windows) in patch names (issue2065)

Merge with stable

win32/hgwebdir_wsgi: clarify documentation and clean up script a bit

Merge with hg-i18n

i18n-sv: translated bisect, dates, locate, manifest

i18n-ja: synchronized with c50a3d7154d2

i18n-pt_BR: synchronized with f142fa3c0a8c

test-fetch: use relative URL to avoid echoing TMP path

fetch: fix newheads calculation (issue2047)

Make annotate --follow an alias for -f/--file to behave like in older versions Since 98a0421b9e52 annotate follows copies/renames by default, but the output of e.g. "annotate --follow --number" should not change without some deprecation time.