mq: use context API

mq: simplify qparents calculation

mq: simplify commit message generation

mq: avoid many hex/bin conversions, keep the binary node when possible

rebase: add option to not commit after a collapsing This option is useful when other extensions (e.g., pbranch) want to use rebase --collapse and append other things before committing. This is not intended to be used from command line.

Merge with crew-stable

hgweb: make code to join url path simpler Now SCRIPT_NAME never contains http://host:port part, we don't need to care about '://'.

hgweb: fix broken URLs of RSS/Atom feeds (issue1772) This fixes doubled URL, e.g. http://example.orghttp://example.org/..., which appears on RSS/Atom feeds served by hgwebdir. It splits baseurl to update SERVER_NAME, SERVER_PORT and SCRIPT_NAME, according to RFC 3875. Updated the test output since SCRIPT_NAME becomes not to contain http://host:port part.

hgweb: introduce helper method to update req.env

rebase: always check if rebasing onto an applied mq patch. Previously, it only checked for an mq patch if the user explicitly passed -d/--dest. But rebasing onto an mq patch is a bad idea regardless of how we determine the rebase destination.

subrepo: wrap long line

merge with stable

test-extension: fix disabled extension tests for run-tests.py --local One test that requires inserting a broken extension into hgext does this by modifying PYTHONPATH. This doesn't work when run with --local because the 'hg' script being used is in the same directory as the local hgext. Instead of modifying PYTHONPATH, a secondary extension is enabled using --config that inserts the dummy hgext at the beginning of sys.path, before the script's path.

subrepo: print subrepo pulling URL

merge with stable

subrepo: keep ui and hgrc in sync when creating new repo

subrepo: forward the push to argument into _abssource

mercurial.spec: remove reference to doc/ja

mq: simplify and use context API

mq: avoid a (potentially expensive) repo.status(unknown=True) call

mq: all_files can be a set, remove dangerous default values

Merge with stable

rebase: remove unnecessary \" from help string They are not needed inside triple-quoted strings and they confuse the line number computation done in i18n/hggettext. The script tries to find the docstring in the source file. When \" in the source is turned into just " in the docstring, the docstring can no longer be found.

test-merge-default and check-code.py: No "export x=x" in sh

Merge with stable

progress: document progress.disable config option

shrink-revlog: add missing whitespace in expression

any is not available for python2.4

keyword: update copyright

keyword: remove deprecated options

style: use consistent variable names (*mod) with imports which would shadow

archive: autodetect archive type by extension (issue2058)

merge with stable

tests: use external coverage, mandate newer version This removes the option for including the stdlib in coverage reports.

churn: use ui.progress instead of --progress

rebase: improve help text - add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options

commands: remove extra indentation from list in help text

server: initialize wsgi app in command, then wrap server around it

server: unnest server classes into module namespace

server: pass wsgi application to server (no need for non-local var)

server: abstract setup of ipv6 vs. normal server

server: handle server-internal config setup inside server class

server: externalize and streamline mixin setup

server: externalize application creation

commands: document and test hg clone update priority

rebase: improve help text - add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options

serve: fix port config

merge with other head, will show bug in hg serve

test-serve: Show if port config and option are correctly used this will break in d3f27d15c9cb

drop (default: 8000), non-zero default is automatically added to help

make expression shorter, now the line fits into 80 chars

serve: fix options recording, trailing whitespace

serve: allow --port=0 to specify "server chooses the port number"

rebase: improve output of hg pull --rebase (issue2072)

shrink-revlog: factor out postorder algorithm

shrink-revlog: factor out suboptimal computation

shrink-revlog: remove branchsort algorithm (it behaves poorly)

shrink-revlog: add accounting of suboptimal nodes to the new algorithms.

shrink-revlog: add "reverse postorder" and "postorder reverse" toposorts. Based on a patch by Benoit Boissinot, adapted to the pluggable sort algorithm design. toposort_reversepostorder() is a very good performer; it's designed to recreate what the revlog would have looked like if Mercurial had parent deltas now. toposort_postorderreverse() is unstable and very inconsistent, but perhaps with some work it could be made better.

shrink-revlog: add --sort option for user-selectable toposort algorithm.

shrink-revlog: rename some local variables for consistency.

shrink-revlog: instrument sort code to record statistics. Notably, count "suboptimal" nodes (predecessor is not first parent) and (with -v) report them at the end of the run.

Merge with crew-stable

convert: handle svn tree with empty roots (issue2079)

merge with stable

bundle: fix bundle generation for empty changegroup

patch/diff: move diff related code next to each other

remove header handling out of mdiff.bunidiff, rename it

remove contrib/hgdiff, it makes refactoring diff/patch harder it can always be revived if needed

demandimport: blacklist _ssl (issue1964)

patch/diff: move patch.export() to cmdutil.export() This API change will allow us to break a cycle between patch and cmdutil.

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.

win32/hgwebdir_wsgi: clarify copyright license

store: only add new entries to the fncache file Newly added fncache entries were not added to the in-memory cache, making it possible for 'hg convert' to cause duplicates in .hg/store/fncache. Duplicates in the fncache file are harmless, but excessive numbers of duplicates from large converted repositories may slow down execution speed considerably.

Updated test output of test-convert-baz after f2618cacb485

trailing spaces (and one stray tab)

Merge with default

Merge with stable

add wsgi script for Microsoft IIS with isapi-wsgi

doc/ja: remove old Japanese man page translations They were added way back in 2005 and haven't been updated since. They are no longer referenced by the Makefiles at upper levels and have not been shipped with a recent version of Mercurial.

Merge with hg-i18n

i18n-sv: synchronized with f4f3a74ce832

i18n-pt_BR: synchronized with b1339234080e

ui: ignore ui.logtemplate and ui.style when HGPLAIN is set HGPLAIN should suppress them because they change Mercurial's default output.

Merge with hg-i18n

i18n-ja: synchronized with bb4561401c84

alias: fixes exception when displaying translated help text __doc__ of aliased command shouldn't cointain non-ASCII characters, because it'll be gettext-ed later by commands.help_(). Here gettext can raise UnicodeDecodeError. Once concatenated two translatable strings into one, it become untranslatable. So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_, where help texts are translated. 'alias for:' was introduced by 6e8a16dd3e30.

Merge with hg-i18n

i18n-sv: synchronized with d1bbf01c4a8e