Replaced mktemp and usage of ${par:=word}.

Remove usage of ${par:-word}, which and mktemp. Quote filenames.

Ignore test error files, protect dot in .pc/

Merge with upstream

Added tests for bug with three-way-merging of old tip, tip and cwd.

Show all dirstate info for 'hg debugstate'.

Make test-pull work on slow machines, where hg serve needs some time to start.

Fixed test to notice .out file generated by run-test.

add note about -C to update message

Drop -t option from mktemp

Fix the directory and revlog collision problem This adds escaping for directory names so that directory foo.i doesn't collide with the revision data for file foo.

Fix undo after aborted commit bug Commit would overwrite undo.dirstate unconditionally, so an undo after an aborted commit would restore the dirstate from the aborted commit and not the prior transaction. This copies dirstate to journal.dirstate and moves it after a successful transaction.

Fix tests for short changeset hashes and hidden manifest hashes

Add a --time command line option to time hg commands

Provided platform dependent implementations for explain_exit os.system return code is system dependent.

Fix copy in subdirectories Spotted by Chad Netzer

Add changegroup hook for push/pull

Add paths command The following patch adds the 'paths' commands to show a named path, or list of available paths. In case anyone find it useful.

Shorten hashes displayed in log

Wrap RSS description in CDATA Problem spotted by Ollivier Robert

Add template to mktemp call Based on a patch from Soh Tk-r28629

Fix up test results No more errnos diff | sed changes .out message ok

Change sed patterns in tests to strip dates after spaces or tabs

Hide errno in abort messages

Make pull count jargon less confusing revisions are now synonymous with changesets, and not file changes

Fixes for annotate Handle files that aren't in the repo Handle empty files

Fix bug in exception handling for hardlink clone

hgeditor: hide checksum mismatch message from md5sum

Fix local file changes being ignored after non-branch merge Bug introduced in eea96285cbf9 Spotted by TAH

Update tests to match new addremove chattiness.

Get addremove to use new walk code. It is now more verbose than it used to be. If given file names, it prints nothing, as before. But if given patterns or nothing, it prints the names of the files it is operating on, to remove that air of mystery. It also now operates at or below the current directory.

Hack to fix missing '/' problem in URLs

Don't mark files with 'm'erge unless we're actually merging branches For 3-way merges, we were marking files as 'm', which should only be used for branch merges. This was causing files to show up in 'hg status' that aren't actually modified.

Added deprecation warnings if -t or --text is used for commits.

Changed more occurances of 'text' to 'message'.

Change all references to -t --text commit message to -m and --message.

Changed coding hint to BOM

Updated TODO.

There was an extra space after 'hg id' when there are no tags.

Updated help strings and test-help: - options -I/-X: always at the end, don't include them in the synopsis. - NAME is optional for hg revert - other small changes.

Added new code contributors, fixed Vincent's name, added hint on encoding.

Show filenames for hg export in verbose mode on a separate lines. This makes parsing by external tools much easier.

Fixes and cleanups to hgeditor: - "HG: merge resolve" isn't supported for a long time now. - detection of unchanged commit message if signing is turned off. - don't add manifest hash to commit message if not signing.

Check protocol versions This also allows the old unidentified protocol

Simplify content type checking

When pulling from a non hg repository URL (e.g. http://www.kernel.org/hg) you geta pretty obscure error (zlib: uknown compression type). The attached patch modifies hgweb.py and hg.py to supply and check a 'Content-type: application/hg-0.1' HTTP header for the branches, between and changegroup commands, so that we know it's a proper hg repo before snarfing the input. Comments appreciated!

Add tag -t, deprecate tag -m manifest hash: 893aa9732b500edfa6ffc099f76b00a88a5b1943

Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05