Changes to network protocol -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Changes to network protocol Stream changes at the delta level rather than at whole delta groups this breaks the protocol - we now send a zero byte delta to indicate the end of a group rather than sending the entire group length up front Fix filename length asymmetry while we're breaking things Fix hidden O(n^2) bug in calculating changegroup list.append(e) is O(n), list + [element] is not Decompress chunks on read in revlog.group() Improve status messages report bytes transferred report nothing to do Deal with /dev/null path brokenness Remove untriggered patch assertion manifest hash: 3eedcfe878561f9eb4adedb04f6be618fb8ae8d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmzlqywK+sNU5EO8RAn0KAJ4z4toWSSGjLoZO6FKWLx/3QbZufACglQgd S48bumc++DnuY1iPSNWKGAI= =lCjx -----END PGP SIGNATURE-----

merge: add count of new manifests, files, and revisions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: add count of new manifests, files, and revisions manifest hash: ff29e3124693a0172ac936fac03fd73cc91778f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmfrjywK+sNU5EO8RAnHZAJ4gwnv4QUipIcP2PhyFVS1lXh9TQwCgipSi r+6d9lUHu2U9UJGFkJPyi/4= =Caod -----END PGP SIGNATURE-----

merge: short-circuit search for merge into empty repo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: short-circuit search for merge into empty repo We should have 3 cases for merge: - - we have no changesets - - we have less than half the changesets - - we have more than half the changesets For no changesets, we can immediately tell that we need everything. This happens when we initially branch from a remote repo, so we simply shortcircuit the search and grab everything from the root When we're actually tracking a project, we should generally have most of the changesets, so the current search algorithm should minimize searching. It should rarely occur that upstreams gets far ahead of us, in which case, we suffer a longer search. manifest hash: eabd55841b03225176ea72b985aad36431a438a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmfajywK+sNU5EO8RAuyKAKCf7Nw6XSK5HEzbrZae7Q06e3dk4wCgjbK6 YUTEfkpPP1h3mNHIHRKz+aI= =eGMq -----END PGP SIGNATURE-----

Add tag for 0.5

Mercurial 0.5 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mercurial 0.5 Update version numbers Fixup MANIFEST.in manifest hash: 58db9be35685e83133f20e96265d6c434fc106c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmOwHywK+sNU5EO8RAq0OAKCkMWzSMzhisTFBmT2WLj2bf+PMqwCbBv+S jNvqIQsru2JMdCQC2eG7CxU= =c20j -----END PGP SIGNATURE-----

Fix two minor merge bugs -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix two minor merge bugs Fix variable name for printing manifest node Trouble with empty between lists from remote repos manifest hash: 000e9267b17c870f673210c8aae50d99e0e5b72b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmOmtywK+sNU5EO8RAs7AAJ9dVyOn5Ne+EopdUqOe8IKVH86R3wCfUhNO CLpuRURCB5Ang19YZ5MLGeg= =NF1T -----END PGP SIGNATURE-----

Add $HGEDITOR hook and example script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add $HGEDITOR hook and example script This hook makes signing commits easier. manifest hash: ba8723e4b52323528dfa681a58658a5b4b2c02e4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmONFywK+sNU5EO8RAj87AKCEa5r9EepdYPiYRGo/jAjjwCIcVACfeBPe QDInXr7karo6/P8d2bM/tVU= =rxIQ -----END PGP SIGNATURE-----

Add manifest hash to commit messages for easy signing -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Here's an example: This is the current manifest hash: e06d11165178d03c296ea7e7854f91e612a8d6bf It was copied from the HG: comment lines that are added to the commit. Then I wrote this commit message, signed it, then closed the commit. The manifest hash is a hash of all the files in the project together with the hashes of manifest's parents. Thus, signing the manifest hash allows us to verify the entire state of project at the time of the commit. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmMrcywK+sNU5EO8RAoKwAJ4gPz2dI1Xh44N3tra43clUGhLVggCbBxuu 8pBZt85SA9ty39+e2+hL9WI= =t/xS -----END PGP SIGNATURE-----

Improved binary diff from Christopher Li This is more intelligent/efficient by combining neighboring inserts, replaces and deletes. Passes test of converting kernel repo, but doesn't appear to substantially affect compression or performance.

hgweb: Sort tags by revision number

Pull from Jake's hg docs

updated for .hgpaths and http/old-http protocol name change

hgweb: Fix navigate to 0 bug

Add ~/.hgpaths to README

Merge from Jake's hg docs

adding doc directory and files

Change hg: protocol name to http: and http: to old-http: hg: will continue to work for a bit old-http: will be phased out soon

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.

Minor fixes to verify

Fix transaction handling bug by reverting fileopener change

Fix pos in navbar Fix bad parent link in changelog

Prettify the web interface Add header, footer templates Add null parent handling Combine files and directories Add parity flag for alternating line colors Add line numbers to filerevision

Simple script to recompress a log file

Minor safety checks to manifest diff

Minor updates to comparison

Revamped templated hgweb

Merge from hgweb

added annotate fixed error page to get tmpl_dir

change template to a generator add write call to output generator

fix problem with non wrapping file list fix file list not appearing in checkin

added template support for some hgweb output, also, template files for the parts that have been converted

making hgweb class

moving hgweb to mercurial subdir

Make hg diff handle files that have been added but not yet committed.

Fix diff and export not showing added files

Add safety checking to mpatch

Fix braindamaged import in mdiff.

Remove some debugging code from lazyparser

Remove python version of the patches code

Remove debugoldmerge command

hg history: don't print file list without -v switch

Subdir support for annotate

Use revlog.delta and mdiff.patchtext to massively speed up processing of manifests. This lets us verify a 28k changeset kernel repo in under two minutes.

Add a function to return the new text from a binary diff

Add code to retrieve or construct a revlog delta

Add fileopener to move some pathname knowledge from filelog to repository

Make revision code slightly faster

Only use lazy indexing for big indices and avoid the overhead of the lazy index in the small index case.

Make lazyindex load slightly faster

Simplify checkout slightly, replace checkdir with os.makedirs

Sort files on check-in for good I/O patterns

Make compression more intelligent: - we don't attempt to compress things under 44 bytes (empirical) - we check whether larger objects actually compress - we tag objects to indicate their compression NUL means uncompressed and starts with NUL x means gzipped and starts with x (handy) u means uncompressed, drop the u

Add script for doing conversion of repo from oldstyle to newstyle

Move hg from storing files in data with base64 encoding to full pathnames with .i and .d extensions. This means we naturally get good FS layout, and cp and tar fix things up nicely rather than pessimizing layout.

Annotate was being too clever trying to work in place, and triggering its assert. Simplify it, fix it, and speed it up a tiny bit.

Warn if we fail to truncate something

Make prompting go Minor UI tweaking Add merge prompting

Don't diff unknown files Fix syntax error from log date

Date on its own line in file log

Pull from hg://edge2.net/hg/cmds

adding subdir support for log and status commands

Merge from hgweb

added pagination for changes (front) page added manifest list added file history

reorganize code into classes clean up html code for w3c validation

making change list be reverse ordered adding link to revision in change list changing revision links to display checkin

Add paranoia to diff code

Add iterator to the lazymap code

Add updated merge3 code

Beginnings of transaction undo support

Refactor merge code Delete old code Fix calculation of newer nodes on server Fix branch recursion on client Fix manifest merge problems Add more debugging and note messages to merge

Fix two bugs in verify

Add debugindexdot to generate graphviz dot files from indexes

hack so that debugindex takes filenames

Fix manifest merge swap bug Add more debug info to merge

Add tip command

Missing newline in "requesting changegroup"

Verify improvements: Check existence of parents of changesets and manifests Count errors Use ui for display Catch and count unpack exceptions Print error count and exit with non-zero status on error

Friendlier exceptions for unknown node errors

Fix merge bug, I hope

More useful message on broken addgroup chain

Add -q quiet option Make -d and -v do something Add a bunch of debug and note messages

Gotos are embarrassing.

Add annotate and blame to the command list and README

Fix field width for annotate Add blame

Add basic annotation support filelog.annotate() will get the change number on each line. Singed-Off-by: Christopher Li<hg@chrisli.org>

Add "HG: merge resolve" to editor text for merge

Fix bug in lazymap code Add a sanity check to addgroup

Add lazy{parser,index,map} to speed up processing of index files

Fix a bug in patches() if there's not text and no patch

(none)

Change revlog to use new patch code

Add an O(m + nlog n) patching extension

Add mdiff.patches to speed up applying thousands of patches to the manifest

Fix debugindex formatting for large repos

Minor changes to import so that we can successfully import Ingo's kernel history patchset.

Print changeset metadata for export

Add tag support

Beginnings of changelog tagging

Fix up a bunch of bugs in the new merge code Move getchangegroup/addchangegroup to generators

Diff in subdirectories from Jake Edge Dates in diff Fix O(n^2) behaviour of manifest diff Add a/ and b/ to work with patch -p1

Minor changes for release 0.4e

Fix tabs Update version number Set new merge as the default

Add server side of hg:// protocol to hgweb

Add hg:// protocol Fix some of the getchangegroup logic

Minor corrections

A quick set of comparisons between hg, git, and bk

hgweb.py from Jake Edge remove hgweb.py from URLs so that it will work as index.cgi

Add getchangegroup code to efficiently calculate and request a changegroup

From: Thomas Arendsen Hein <thomas@intevation.de> Good. Attached is a patch which also tries to use $EMAIL as the commit user and removed a try/except by using os.environ.get.

Fix lsdiff filtering

Drop empty lines from lsdiff

Strip trailing spaces from lsdiff file list

Ignore .orig and .rej files from patch

Add -q option to import Make import complain if patching fails

Import comments from patches

Fix resolve bug putting unchanged files in resolve cset

Rollback is implemented

Add changegroup support

Fix recursion depth trouble with ancestor algorithm

Fix occassional diff bug with manifests

Attempt to recover journal automatically

Fix multiple changes to file per transaction

Fix truncate logic for indices again

Date is an int as a string in changelog

Add lookup smarts everywhere Fix import command

Add improved rev lookup to diff and export

Move hex/bin bits to revlog Handle lookup of rev -1 of changelog

Add smart node lookup by substring or by rev number

unidiff: punt on comparing empty files

Add export command

Support for 0, 1, or 2 diff revs

Add diffrevs function to compare two nodes

diffdir tidy in preparation for arg handling

Fix up commit arg breakage

Make diffdir take a revision argument

Add some tests to the repo

hg co after hg merge

Simplify integrity checking More fiddling with transaction truncate points (still untested)

Fix corruption from manifest.listcache optimization Put the remove edit text in the right place

Add debughash and debugindex commands

Import time for hg history command

Document diff in help Add filenames to diff support

Show date in history

The actual hg remove fix from Thomas Hein

From: Thomas Arendsen Hein <thomas@intevation.de> mercurial 0.4d had the same problems with removing files, but attached is a patch which fixes that problem. The key change is in dircache.remove(): del self[f] should have been del self.map[f] This error was hidden by the 'except: pass' statement.

Give a friendlier message when repo isn't found

Make hg verify do more thorough cross-checking.

Update version numbers

Fix network pull of repo files with "%" in their base64 encoding.

Fix off-by-one truncation in transaction rollback.

Fix empty transaction destruction

Delete journal on destruction even if there are no entries to replay.

Allow checkout by number or hash Print files touched in changeset Fix reporting of incorrect changelog rev links in verify

Fix linking of changeset revs when merging

Ignore empty ignore patterns

Ignore MANIFEST

Add MANIFEST.in to repo

Add some ignore expressions

Don't complain that help is an unknown command

Fix exception handling for reading current working version

Ignore build/ and .pyc files

Handle nullid better for ancestor

Update README to discuss remote pull, rsync, and the hg repo add a .hgignore file