commit: move editor outside transaction The commit editor is now invoked before files and manifest are committed. The editor is now run with only the wlock held and aborting an edit no longer requires rolling back a transaction. Changes to files during a commit still result in undefined behavior. (This is preliminary work for committing subrepositories)

convert: directly use nullid

Merge with stable

Fix how setup.py identifies the Mercurial version. There is a problem with setup.py where it will not identify the Mercurial version properly when not being ran in within a repository even if mercurial/__version__.py exists. To fix, use mercurial.__version__.version when available before defaulting to "unknown". (Using mercurial.util.version() is not an option due to a dependency issue where osutil can be referenced before it is built.)

templater: replace eval with closure

win32mbcs: remove silly eval

merge with crew

addremove/findrenames: find renames according to the match object (issue1527) Instead of only finding similarities in the added/removed files found by the addremove step, follow the match object: hg addremove -s80 foo -> add and removes files in foo + find similarities between files in foo hg addremove -s80 -> add and removes files in the whole repo + find similarities between files in the whole repo hg import --similarity will still work correctly (only find similarities between files found in the patch).

addremove: mapping isn't really needed, simplify

gitweb, monoblue: break long line in map file

coal, paper: add newlines when displaying a file in hgweb The newlines make the HTML somewhat readable and gives much smaller, readable diffs when the tests change.

test-highlight: decouple test from get-with-headers.py The test copied get-with-headers.py from $TESTDIR and committed it to a test repository. The test output therefore depended unnecessarily on the exact content of get-with-headers.py. It has now been replaced with another small Python script.

Merge with crew-stable

convert/cvsps: use set.update for bulk update

hbisect: use set.update for bulk updates

localrepo: use set.update for bulk updates

store: create set directly from iterable

repair: bulk update sets Use a single set.update and set.difference_update call instead of many set.add and set.discard calls.

ui: use set instead of dict

alias: honor the [defaults] section, fix issue1642

templater: keep a cache of Python functions for filter expressions

templater: replace regex complexity by simple str containment checks

templater: clean up the process method, separating code paths

patchbomb: make diffstat usage clearer Making it clear that diffstat output does not only depend on diffstat being installed - it also needs to be explicitely requested.

patchbomb: describe --attach and --inline options in help

patchbomb: fix help to reflect actual operation In the body, the description is shown in its entirety, unstripped from what was already in the subject.

convert/bzr: warn when source is a lightweight checkout (issue1647)

localrepo: use set instead of dict

copies: use set instead of dict

store: use set instead of dict

verify: use set instead of dict

ancestor: use set instead of dict