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

commit: move lots of commitctx outside of the repo lock

commit: combine _commitctx and commitctx, drop unused force argument

editor: move HG: filtering from ui to commiteditor

grep: make cache LRU rather than unlimited grep could cache an unbounded number of revlogs, limit to 20 with an LRU cache.

commit: move commit editor to cmdutil, pass as function

context: add p1 and p2 methods

commit: push repo lock down into _commitctx

commit: move 'nothing changed' test into commit()

commit: drop unused p1 and p2 args

tag: drop unused use_dirstate and parent from _tag()

filecommit: swallow some bits from _commitctx, add _

commitctx: replace wctx with ctx

commitctx: replace two dirstate vars with working

commitctx: simplify locking (spotted by Simon Heimberg)

remove deprecated rawcommit

patch: copy copies dict before changing it (issue1651)

status: check cmp list in order

verify: detect manifest revs not in any changeset

localrepo: use more direct vars in addchangegroup

localrepo: use cl throughout in addchangegroup

revlog: slightly tune group() by not going rev->node->rev

drop unused imports

indentation cleanup

test-debugcomplete: add --show merge option to output