spartan: ensure equal heights for file and annotate views The display used to jump up and down when switching from the file view to the annotate view. It now stays still: when switching from the file view to the annotate view it looks like the file content is simply right-shifted to make room for the author names.

coal/paper: simplify margin and padding CSS rules

spartan: simplify CSS colors (#xxxxxx -> #xxx)

coal/paper/spartan: remove extra line break in annotate view

commit: tidy up mergestate slightly

commit: drop unneeded dirstate invalidate logic We no longer touch the dirstate in the middle of a commit, so a failing commit doesn't require invalidating the dirstate.

commit: some tidying - simplify handling of 'close' - kill silly wlock=None - sort/uniq files later

commit: remove unused lock var

commit: move description trimming into changelog

commit: simplify manifest commit

commit: explain how to abort commit in editor

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

revlog: use set instead of dict

bisect: use set instead of dict

repair: use set instead of dict

patch: use set instead of dict

record: use set instead of dict

hgk: use set instead of dict

convert: cleanups in monotone converter

merge with crew

convert: use set instead of dict

bugzilla: use set instead of dict

rebase: use set instead of dict

revlog.missing(): use sets instead of a dict

tests: add missing interpreter lines

cvsnt-mergepoints test: use sh instead of bash

tests: removed unnecessary execute bit on Python tests

tests: renamed Python tests to .py

tests: renamed helper to avoid clash with stdlib repr module

tests: fix doc string in get-with-headers.py

tests: use repr.py to avoid binary characters in test output

tests: new helper for tests with binary output

convert: improve docstrings, comments.

changelog: turn {de,en}code_extra methods into functions The methods were not really methods -- they didn't use 'self'. Having them as functions in the module it useful for other modules (like the commitsigs extension) that want to recompute the changeset hash and thus want to encode dicts the same way as changelog does it. Removed the underbars from their names at the same time.

merge with crew-stable

contrib/win32: add simple style sheet

contrib/win32: updated title of the hgbook

contrib/win32: format file names and env vars with <tt>

contrib/win32: indent and word wrap consistently

contrib/win32: add missing <p> tags

contrib/win32: fix HTML tag nesting

contrib/win32: license is GPLv2 only according to Matt Mackall

Merge with crew-stable

mq: qpush shouldn't complain if working dir is at a non-tip head

contrib: add tmplrewrite.py script to help rewrite old templater syntax

spartan: use newer template syntax everywhere

monoblue: use newer template syntax everywhere

raw: use newer template syntax everywhere

atom/rss: use newer template syntax everywhere

git: use newer template syntax everywhere

Add tests for qfold

mq: abort qfold upon local changes (issue1662)

changelog: refuse to add revisions with empty usernames An empty username or a username with a "\n" will make the revision text contain two "\n\n" sequences -> corrupt repository. The problem is that changelog.read expects to find exactly one "\n\n" separator and thus cannot unpack the revision.

convert/bzr: fix symlinks target (issue1626/2)

changelog: removed bad default arguments in add method The arguments defaulted to None, but - user cannot be None since it is immediately stripped. - p1 and p2 cannot be None since they are passed directly to revlog.addrevision, where they are mandatory.

posixfile: remove posixfile_nt and fix import bug in windows.py The posixfile_nt class has been superseded by posixfile in osutils.c, which works on Windows NT and above. All other systems get the regular python file class which is assigned to posixfile in posix.py (for POSIX) and in the pure python version of osutils.py (for Win 9x or Windows NT in pure mode).

util: make atomictempfile saner if mktempcopy fails

merged with crew-stable

util: import random, missing since ea82a23cf887

clone: try updating to the actual changeset specified in options When cloning with the -r option or # url format from a tag the destination repo most likely won't have the tag. We can save the lookup result to get to the correct parent anyway. Similar to issue1306, but for tags.

commit: hoist the rest of the dirstate manipulation out of commitctx

commit: hoist up dirstate invalidate

commitctx: use contexts more fully

context: add new manifestnode method

commitctx: eliminate some variables