Emacs: kill commit buffer once it's done with.

Emacs: first cut at commit support.

contrib/patchbomb: Fix buglet with empty cc list.

Fix handling of addresses in hgrc.

Emacs: document existing functions.

Emacs support: add hg-revert-buffer.

Fix callers to file.revision to use file.read This was causing unchanged files to show up as modified.

Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

Fix up some bugs introduced by recent merge changes - use new changed list to track what files actually got new revlog entries at commit/rawcommit time - when updating a file during a merge, don't mark it as completely unchanged - handle file not being in parent 1 in status

merge: remove remaining mark bits

Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.

Reformat debugindex output

Remove unused relfilter function

hgweb: change startup argument processing - allow passing a repo object instead of a path (if we get a string, we construct a repo object) - hg serve: pass options via repo.ui.setconfig - add --style option - get default name from repo.root rather than getcwd() - remove template argument to hgweb() - reduce create_server from 8 args to 1

Add web:style option

hgweb: fix RSS and raw for new % scheme

Remove debug print

Fix RSS feeds

hgweb: convert index entries to list expansion style

Merge with jeffpc

Merge with MPM

hgweb: Changed manifest page to list format syntax

hgweb: Changed file revision page to list format syntax

hgweb: Changed annotate page to list format syntax

hgweb: Changed file page to list format syntax

hgweb: Changed changelog page to list format syntax

Added support for #foo%bar# syntax This required moving template() into the templater class

Deal with non-integer date offsets generated by some tools

Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32

Remove call to non-existent date_parser