template: fold template() into __call__, minor optimizations - use non-grouping operator to avoid some extra processing - avoid copying and updating defaults - unnest main template body - avoid returning extra empty string if format

templater: simplify cache and remove filter argument in __call__

templater: simplify template function

templater: take cStringIO out of indent

templater: remove cStringIO from stringify

templater: remove cStringIO for fill

templater: use str.decode in parse_string

bundle: don't use sets.Set

revlog: reachable actually takes a node

util: add copyfile function

hgweb: internalize some socket details

remove unused imports

tests: add -i switch Prompt to accept changes for tests where output changed

tests: add -R switch Restarts at first .err file if one exists, otherwise runs all tests

tests: sort test list if running all tests

Fix accessing a repository via -R/--repository through a symlink. Sometimes the repository root was compared to os.getcwd(), which always uses the canonical path without symbolic links in it. This would changes self.root of the localrepo objects to always use os.sep as the directory separator, which is implicitly assumed in some places, but may not be the case if somebody uses -R foo/repo on windows.

Merge with upstream

localrepo: factor commit and rawcommit note: rawcommit with an empty text will now launch the editor

localrepo.commit: little cleanups - use a list for new fileids - sort the removed files

Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.

Clarify untracked file merge message

Remove references to documentation that was removed in da9506fe2710

Corrected documentation for return value of python hooks.

Fixed directory name having an extra dot on "hg archive -t tbz2 foo.tbz2". Problem reported by Rob Landley.

Try hgweb unbundle methods in the order presented by the server. If no common bundle format is found, push is aborted.

Client support for hgweb unbundle with versions.

Add allowed bundle types as argument to hgweb unbundle capability. Arguments to capabilities were added before the 0.9.1 release, so there are no compatibility issues. Mercurial 0.9 didn't support http push. Using HG10GZ, HG10BZ and HG10UN has the advantage that new bundle types can be added later and the client doesn't have to try sending them first and reacting on errors sent by the server.

hgweb: remove debugging print

hgweb: introduce a new capability for sending a compressed bundle the header of the bundle is the same as a on-disk bundle HG10UN: uncompressed HG10BZ: bz2 HG10GZ: gzip no header means uncompressed (old client)

hgweb: if the server supports it, send a compressed bundle