hg: remove some debug commands, improve help messages, add .hgpaths file .hgpaths is a file with lines of the form: <symbolic name> <repository path or url> that allows you to do: hg merge <name>

hg merge: abort if there are outstanding changes in the working directory We currently don't support merging from the tip into the working directory, so merge with outstanding local changes is asking for trouble.

hgweb: make navigation of changesets a bit nicer

hgweb: alternating colors for multifile diffs

trivial tweak to merge3

hg diff: fix missing final newline bug

hgweb: actually commit the tags template

hgweb: add tags links and manifest links This adds a simple new tags page to browse by tag, adds the tag link everywhere, and adds manifest links to the tags and changelog pages.

Hide most revision numbers in hgweb

hgweb: don't blow up on search for unknown keys

Add tag/rev/node search to hgweb

Make fancyopts handle no arguments This lets hg serve work with no args.

Make undo and recover friendlier Add them to the help display, have them report failure

Implement recover and undo commands This adds an interface to transaction to rollback with a given journal file and commands to rollback an existing .hg/journal or .hg/undo.

Simply repository locking This is a first pass at implementing repo locking. Next up, journal recovery and undo.

Update the README a bit

Add example CGI script This gives an example of how to easily use hgweb via CGI

Add 'hg serve' command for stand-alone server This adds a simple stand-alone web server mode to hg that exports the current repo for merging and browsing. The default port is 8000.

Install the templates where they can be found by hgweb.py This ought to use package_data but that doesn't exist in Python 2.3. So we do a hack of install_data and use glob. This also adds templatepath() to hgweb.py which finds the templates relative to hgweb.py's location.

Fix some broken parent links in hgweb

Merge from hgweb

fixed problem with head/body tags, added dtd, fixed table attributes add quotes around all attributes (w3c recommendation) pages pass w3c validator

changed pos to rev for changelog cmd, changed & to ;

hgweb is no longer a script

Bail on attempts to do an empty commit

Add options to annotate for user/rev/changeset This eliminates the blame command and makes annotate more flexible.

Pass filename to $HGMERGE This lets the merge program be slightly more user-friendly

Improve pruning of branches in outstanding changeset algorithm These changes make the client keep track of what it's seen more carefully to avoid some redundant requests.

A new ancestor algorithm The old ancestor algorithm could get fooled into returning ancestors closer to root than it ought to. Hopefully this one, which strictly orders its search by distance from room, will be foolproof.

Handle merge with deletions If you merge with a repo that has deleted a file after editing it, hg attempted to resolve the file. This (correctly) resulted in hg verify errors because the resolved version didn't show up in the manifests. This moves the manifest resolution before file resolution and decides which files to resolve based on the (partially) resolved manifest. After files are resolved, the final manifest is committed.