Add an option to hg serve to serve file using IPv6

Merge with BOS

Use list comprehension in hg status.

Attempt to yield names in sorted order when walking. This is an improvement in behaviour, but the walk and changes code still has some flaws that make sorted name presentation difficult: - changes returns tuples of names, instead of a sorted list of (name, status) pairs. - walk yields deleted names after all others.

Ensure that dirstate.walk only yields names once. Its predecessor code used to do this, and now it does, too.

Clean up walk and changes code to use normalised names properly. New function: commands.pathto returns the relative path from one path to another. For example, given foo/bar and baz/quux, it will return ../../baz/quux. This new function is used by the walk and status code to print relative paths correctly. New command: debugwalk exercises the walk code without doing anything more. hg.dirstate.walk now yields normalised names. For example, if you're in the baz directory and you ask it to walk ../foo/bar/.., it will yield names starting with foo/. As a result of this change, all of the other walk and changes methods in this module also return normalised names. The util.matcher function now normalises globs and path names, so that it will match normalised names properly. Finally, util.matcher uses the non-glob prefix of a glob to tell walk which directories to scan. Perviously, a glob like foo/* would scan everything, but only return matches for foo/*. Now, foo/* only scans under foo (using the globprefix function), which is much faster.

Update output for test-merge5.

Actually implement the -f switch for push

Make ssh URL parsing more robust

Warn on pushing unsynced repo or adding new heads By popular demand

Psyco was failing to call dirstate.__del__ for import Remove it.

Merge with BOS

Adapt commit to use file matching code. The code is slightly complicated by the need to commit all outstanding changes in the repository if no file names are given (other commands operate on the current directory and its subdirectories in this case). localrepository.changes has acquired an optional match parameter, to let it filter out include/exclude options.

Reduce the amount of stat traffic generated by a walk. When we switched to the new walk code for commands, we no longer passed a list of specific files to the repo or dirstate walk or changes methods. This meant that we always walked and attempted to match everything, which was not efficient. Now, if we are given any patterns to match, or nothing at all, we still walk everything. But if we are given only file names that contain no glob characters, we only walk those.

Fix documentation of -I and -X options. These options apply to all names, not just to directories. In other words, you can do something like this: hg add -X 'f*' '*.c' and it will have the effect of "add all files matching *.c, except those starting with f".

Move commands.forget over to using new walk code. With no names, it now recursively forgets everything, as is the default behaviour of other commands. And prints the names of all files it hasn't specifically been told to forget.

Fix performance regression in addremove command. When I rewrote addremove, I lazily put a call to repo.changes in, which was unnecessary and slow. This is a new rewrite, preserving the file name behaviour, but replacing the call to repo.changes with a walk, which is much cheaper, and avoids calls to os.stat on all but files that have probably been deleted.

Merge with TAH

Include tests (or possibly maps) ending in numbers in MANIFEST, too.

Add Makefile from doc directory instead of / to MANIFEST.

Drop .err files generated by failed tests from the MANIFEST.

Incorporated most of Aron Griffis suggestions for sh compatibility.

Use tabs instead of spaces where apropriate.

Allow tests for not yet fixed bugs to fail without generating error diff.

Updated output of tests.

Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

Adapted README to new needs.

Make tests work on Solaris: - replacement for mktemp - fall back if shell arithmetic doesn't work - replacement for 'set -x' (which results look different with some shells) - "FOO=bar; export FOO" instead of "export FOO=bar" - don't use 'if ! ...'

Remove "export FOO=bar" bashism.

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

Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0

Add -m for rawcommit manifest hash: cf066b609ab4854a731c103f1d456d89cf5e1312

Change C to M in status

Add -m for commit and deprecate -t Index: hg/doc/hg.1.txt ===================================================================

Handle empty file list for annotate

Remove ls command

Refactor matchpats and walk Move core match function code to util Add some comments and whitespace Simplify options Use lambdas instead of always and never

Fix some line wrapping manifest hash: 43af5dafa55e01f89727096f4d6784317f3eb0d6

Merge from BOS manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659

Split make_file back out into make_filename and make_file. It turns out that make_filename is useful by itself.

If the argument to make_file can act like a file, return it. This is useful for code that calls command functions, but doesn't want to send I/O through the filesystem.

Merge with Matt's tip.

Update tests to reflect walk changes.

An empty .hgignore file must cause us to ignore nothing, not everything!

Update docs for annotate and diff.

Convert annotate over to walk interface. Add emptyok parameter to walk and matchpats, for commands that require at least one name.

Convert diff command over to using walk code.

Add name matching to status command.

Only walk over files that match our criteria.

Turn make_filename into make_file, which returns a file handle.

Fix typo.

Get commands to raise Abort instead of ui.warn(...),sys.exit(1).

Add a source designator to the walk methods. If the source is 'f' (the filesystem), the file definitely exists in the filesystem. If 'm' (a rev or dirstate manifest), the file may not still exist with the given name.

Merge with Matt's tip.

Get add and locate to use new repo and dirstate walk code. They use a walk function that abstracts out the irritating details, so that there's a higher likelihood of commands behaving uniformly.

Work on walk code.

Add doc/Makefile to MANIFEST manifest hash: 1fc29da9334caa71ff8df55c52747f9c93df7e0f

Fix verify error reporting bug Spotted by Chris Mason manifest hash: d5a6e5cb65d2de65a68d1f85c8692e79622844d3

Change hgit revision lookup to use repo.lookup

Fix hgit usage of repo.changes and fancyopts to reflect current hg api

Fix typos in FAQ

Be even more specific with .hgignore regexps, added *.swp files. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Be even more specific with .hgignore regexps, added *.swp files. manifest hash: 6664148b687983a41ef50d5bd4fd40426fb96621 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2TThW7P1GVgWeRoRAhObAJ9ZuBxwCBSTZ9MSonw4q1EaluxMMQCfdrBo Czu2RdQEK4RZQh/ngzm73p8= =8XOM -----END PGP SIGNATURE-----

Fix up ignore regexps.

Make annotate use option --rev instead od --revision like other commands. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make annotate use option --rev instead od --revision like other commands. manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C PhOGWMHVlNYGZxmdXridIc4= =J7Cn -----END PGP SIGNATURE-----

Some cleanups in commands.annotate(). -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Some cleanups in commands.annotate(). manifest hash: 9581ad3bb9ebc418e4772158c505e34b92496e92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2K+nW7P1GVgWeRoRAr3VAKCGvKbhmG4yweZTgmxIgaZlmz16HQCdFupq BKcWfEn17Y1l6IDbGS0rDyI= =/fR/ -----END PGP SIGNATURE-----

Added missing newline after two error messages. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Added missing newline after two error messages. manifest hash: c730cdf92c66ee5b44a4cd9b67f72deb844e4010 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC2B0mW7P1GVgWeRoRAjXJAJ48fbg6jXN65pBPGW/YmWn9OtKakACgjnr9 DPySaeLr3/bU7KhFdZPI7/4= =Lvsx -----END PGP SIGNATURE-----

Merge with myself. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with myself. manifest hash: e47e1ba87ecb28a08f819401fd8c2a88bc830261 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC168rW7P1GVgWeRoRAmknAJ0ea1BrnM1KSnfPqkYpurFpV+booACcDGNh ka6ciaH1pQLhOyKgqdbqwOA= =pOV4 -----END PGP SIGNATURE-----

Show filename for hg export in verbose mode. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Show filename for hg export in verbose mode. manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W M0TB/OvU0g5uvudZVQMsJd0= =yq7Y -----END PGP SIGNATURE-----

Use dirstate to check if .hgtags needs to be added. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use dirstate to check if .hgtags needs to be added. manifest hash: f90af1553754eb703fc457ffdd5ded0de6fa47e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15i1W7P1GVgWeRoRArDvAKCSxWDCbwU12ICwwVUoe753H8GYIwCfZGs0 HcL8cOp+eHz85AMJJE/xfck= =1xKK -----END PGP SIGNATURE-----

Fix synopsis: hg forget needs at least one file name. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix synopsis: hg forget needs at least one file name. manifest hash: 1386189a11f9bc539ae2c4bf93333235931d8bc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC14i7W7P1GVgWeRoRAj3OAKCBPkYzoxOHu0Xp/vZ6Myz6JGM4hACgimU+ Gw1Av4ESM2ivORd8ulHMdBc= =kDiv -----END PGP SIGNATURE-----

Use changelogentry.tmpl for search results, too. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use changelogentry.tmpl for search results, too. Since both are lists of changelog entries, they don't need to look different. This fixes a bug where only changelogentry was updated, but searchentry not. manifest hash: 9bfe7a3dd4512d3ee4e5538f369371bce6d55520 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13zrW7P1GVgWeRoRAghNAJ9Agd+uPQ2iGdHAnjebr2R/RzAzUACdEyWq +yKY7wp16TD72ls6Q49LHJg= =9aSM -----END PGP SIGNATURE-----

Changed command synopsises to match style of common UNIX tools. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Changed command synopsises to match style of common UNIX tools. manifest hash: cf62235e46f5c06ac5a3c88cb61e9b57d35fe222 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC13YhW7P1GVgWeRoRAnSOAKCOtrYHZ2XMTjpphY/G2UZHcJcZeQCdFsgv D5Hu+s9ahVX8hns2ZbQpriI= =g6NW -----END PGP SIGNATURE-----

Make "hg parents REV" work (again?) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make "hg parents REV" work (again?) manifest hash: d14db0d23b539ad0b754a51a83926d14f1be9a6e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC12adW7P1GVgWeRoRAtknAJ9TeUybLWYWY+Bi2b5grmAspgfemwCeP9cd 6mYSTWIsovCqW59KIrEvVVo= =u5nR -----END PGP SIGNATURE-----