Trap OSError when deleting env vars On the other OS, it seems that case insensitivity for environment vars can bite users when using some unknown combination of python 2.4.1 and win2kSP4+minsys (and probably other vversions of these softwares). The best way to avoid problems in those weird cases is to ignore OSError exception during env var deletion.

[PATCH] Move default page name into map file Move default page name from code into the map file. This way, different hgweb styles/themes are free to select their default (no cmd in args) page.

[PATCH] Propagate the template map though recursively This patch allows propagates the template map though recursively though all the templates. This allows for some hgweb template cleanup patches as well as it makes writing new skins/themes for hgweb much much easier. (I'm planing to write several basic ones.)

Fixed encoding of directories ending in .d or .i: One .d and .i was mixed up, and string replace method doesn't work in-place.

Added Tristan Wibberley to contributors.

Fixed revlog.children. It was comparing a node to a rev, then appending a rev onto the list of children being constructed instead of a node.

Update TODO

Allow HG patch to appear late in the input stream

Added Samuel Tardieu to contributors list.

Add temporary documentation files and profiling output to .hgignore

Further help improvements: Show command aliases in 'hg help something', unless in quiet mode. Show short command description with 'hg help -q something'. Show global options in verbose mode of command help. State that Mercurial is a Distributed SCM.

Always show short help when an unknown command is given.

Update the TODO file to the help changes, and the output of test-help.

When hg is invoked without parameters, the short list help is displayed. When hg is executed without parameters ( or hg is executed with the 'help shortlist' command ) the short help list is displayed. If the 'help' command is passed on the commandline the full help list is displayed. In both the cases if the switch '-v' is passed, the help contains also the aliases of the short/full commands list and the global switches.

More verbose information on the global options

'hg help -v' mentions the alias of the commands

'hg help -v' shows global options

Rewritten change type selection for hg status.

Realigned command table again.

hg status: added options to select files by status. Added options -m, -a, -r and u to select files corresponding to status M, A, R and ? respectively. If none of these options are specified, files of all status will be shown.

Merge with BOS

Merge with Matt.

Fix performance of hg diff. commands.walk has been refactored. commands.walk's behaviour remains as it was, but there is a new function, commands.makewalk. This returns results that can be passed along to other internal code, in our case dodiff.

Merge with TAH

Cleaned up trap handling in run-tests, too.

Use sh instead of bash in tests.

Removed special FIXME handling in run-tests, added bug info to .out files.

Handle broken pipe on pressing Ctrl-C with e.g. 'hg log|grep something'.

Cleaned up trap handling: - Use numbers instead of signal names - No need to explicitly call "cleanup_exit RC" to exit with return code RC.

If rejects are empty after using the editor, merge with diff+patch was ok.

Shortened hgmerge a little bit.

Hide error message of type command.

Fix array overflow bug in bdiff I ran into a bug while importing a large repository into mercurial. The diff algorithm does not allocate a big enough array of hunks for some test cases. This results in memory corruption, and possibly, as in my case, a seg fault. You should be able to reproduce this problem with any case of more than a few lines that follows this pattern: a b = = 1 1 2 2 3 4 3 5 . 4 . . 5 . . . I.e., "a" has blank lines on every other line that have been removed in "b". In this case, the number of matching hunks is equal to the number of lines in "b". This is more than ((an + bn)/4 + 2). I'm not sure what motivates this formula, but when I changed it to the smaller of an or bn (+ 1), it works. [comment added by mpm]

Allow import from files with spaces Index: hg/mercurial/commands.py ===================================================================

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-----

Merge with TAH manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821

Make makelock and readlock work on filesystems without symlink support. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make makelock and readlock work on filesystems without symlink support. This way you can have a repository on a fat partiton, e.g. a USB stick. manifest hash: cea2c120ef2b25a50c5d98b59648f773feefe470 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1t5yW7P1GVgWeRoRAsKjAJ9BFcn/EqBK/dmJ4BY1pPIZIbDDJACghN3p VCQS6CJ72MHpzhOOsnOpHzE= =laDT -----END PGP SIGNATURE-----

merge program setting from hgrc wasn't used. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge program setting from hgrc wasn't used. manifest hash: 49da647e02534f51324a7a955a34c64c05bd8fa0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pKjW7P1GVgWeRoRAt6AAJ9ZB6NerDpWA/k2ZZeN6VUsSDkB8wCePhMd Xr+Tb86zo+xFhHq7YkDvLak= =+BY9 -----END PGP SIGNATURE-----

Fix default values and add interactive setting to [ui] section of hgrc docs. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix default values and add interactive setting to [ui] section of hgrc docs. manifest hash: 211eea218970b45b2a0cdc822d5b6610a89ffbd7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1pE8W7P1GVgWeRoRAof+AJ4mpm3DCRqh+9To3Gn4bpC7UGcTnQCfVIWN 5VT9pqdP6/06tH8nYgW55f4= =uNyy -----END PGP SIGNATURE-----

On importing the result of 'hg export', parse while reading and drop headers. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On importing the result of 'hg export', parse while reading and drop headers. manifest hash: 385cb4205bb6e4291a412d740400de44bd2e4014 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1otNW7P1GVgWeRoRAiSpAJ4jGhjyEnI2aqCM6pgC8KWSWRkDugCgkVMK rd/YNziDK3TNRhI3yKNrLVw= =w6ht -----END PGP SIGNATURE-----

Removed extra spaces for default parameters according to PEP8. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra spaces for default parameters according to PEP8. manifest hash: 0f6bcc95adf406c8f6dafd92b7c7d3523b6dfe2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1oNhW7P1GVgWeRoRAn76AJ4m8rFUeeUDRC0qVEmjjmPClmAFsQCdE3rN Juv2dSoGteRm0DBXz7xnF4c= =PMki -----END PGP SIGNATURE-----

Removed duplicate use of os.path.normcase(). -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed duplicate use of os.path.normcase(). manifest hash: cccacfb66a4de9abc20095b28e6bab9b51dc4fa9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1n0LW7P1GVgWeRoRAueGAJ9256Jiwv4QbrFIV3Px/SmBMkddjQCbBop/ J2Yi2np72OAKVPhFhCijH6s= =aAyf -----END PGP SIGNATURE-----

Use python function instead of external 'cp' command when cloning repos. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use python function instead of external 'cp' command when cloning repos. Inspired by a patch from Stephen Darnell. manifest hash: b525b0bf40f349b362db7c46d62be41572ef65cf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1ncZW7P1GVgWeRoRAiJmAJ9GaCPaG6yOKb72I+SpDDdcdXTISACePD0H GR/F+qqzi2imdgIV77ziLcQ= =YVd2 -----END PGP SIGNATURE-----

Multiple cleanups of things detected by pylint. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Multiple cleanups of things detected by pylint. Spacing, multiple statements on a single line, overloading builtins, except statements without exception type, unused variables, etc. manifest hash: 457b33b30200d9f71ca707a0bef78053d9091107 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1jOEW7P1GVgWeRoRApr5AJoClL7FkGXT9Z36xF71zdVH463O0wCeJJwb gJSn0jHlLZ3m25OI+BuZCrI= =HVDq -----END PGP SIGNATURE-----

Removed extra newline in hg log when not using the --patch option, fixed tests. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Removed extra newline in hg log when not using the --patch option, fixed tests. manifest hash: 4d83d4af68581affe4cd2dacf840ec78bf18311e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1jJdW7P1GVgWeRoRAkoIAJ4kI8WFisp8fJTMsUCddLwK0O1mHQCgj+fx XDIXrDpUULYSSck3eD4QHY4= =jKKB -----END PGP SIGNATURE-----

Fixed tests. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed tests. manifest hash: f6f36e6f95ea99efccc84dfa1d0af63d414a0eba -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC1hsCW7P1GVgWeRoRAtbyAJoDpbSygoutryu3P/miCpX2Q/LA8gCgiClo P+1ZpH0gycio/V4CKmj5Hlo= =JVBT -----END PGP SIGNATURE-----

Teach convert-repo about tags Git tags are bad, very bad. More importantly, they're horribly inconsistent. This drops tags which don't appear to work like most of the others. manifest hash: f2dda9e9a3ae8a0d84b19e496059b8a795b8e603

Be quiet about broken pipes manifest hash: 3163ebe2f15c3a577456cfdcd2b136c3c7cf7378

convert-repo: deal with packed git and other fixes call out to git-cat-file directly to deal with packed files use git-diff-tree --root to handle import of first commit quiet some dirstate warnings fix parent logic in commit whitespace bits topological sort fix manifest hash: 2943af0168dd2f5e85bba6515fd08687e264863f

HG environment variables take precedence over hgrc manifest hash: c128b53429f861c0b75c2a81c6ad4907e4779810

Minor merge fixups return a proper errorlevel on abort let force jump across branches catch exception on unlink manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

Make manifest lookup use changeset ids manifest hash: 83cf1ac9c68ad9e8de29d2c629c8a06eaeeeae15

Repair the hgweb search interface manifest hash: f5c644f14b31da897dc66f96c2852ae1f11f43f1

Hide file hashes in log There are six different kinds of revision numbers and hashes: changeset hash and local number manifest hash and local number file hash and local number We really ought to expose only the changeset hash and local number, so begin hiding the others from the end user manifest hash: 40d07cc930e84a9283d5e03ade23e3454401e148

Reapply startswith() changes that got lost with stale edit manifest hash: 16d7feedd561591a21727a4c13a1223019d802a7

Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd

Turn off signing with hgeditor by default manifest hash: f2732475351ee22d78e0dab629db03f1f215b21f

Revert hgeditor change to manifest bits -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Revert hgeditor change to manifest bits I'd rather have a blank line at the top. This code primarily exists to show possible methods of signing changesets so I'm not very concerned about conciseness or performance. I should probably have all the signing commented out or disabled by default. manifest hash: 764da8d65bdaf9b45c7e3efd6cd2b4ee70979417 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC01sdywK+sNU5EO8RAr2BAJ9Uq0XberFrYyehvmoKgE8p/j0XFQCdFPJr DPDMbKeBHwK/yMiileBFW8o= =DvnD -----END PGP SIGNATURE-----

Revert hgeditor md5sum change -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Revert hgeditor md5sum change My copy of md5sum doesn't do --status manifest hash 509a316ca72aca095c590fb120eb2ee8260814dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC01pKywK+sNU5EO8RAkDWAJ0dWHz3Vp5oR2be9k3d1Km2Br53xgCgrBLF Ja2tOYCu/nP4sh3CsOsIO78= =zHkj -----END PGP SIGNATURE-----

Sort files for removal

Handle undeletion of files when checking out old revisions Spotted by Marc Singer

Actually move .hg into ignore

Alternate fix for SIGHUP on the other OS Suggested by K Thananchayan

Fix up test for update flags

Remove references to 'cloning by hardlink' from tests. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID c12a49438454e9782ff7eb9b11841e7b9406fbab # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d Remove references to 'cloning by hardlink' from tests.

hg clone stored path fix # HG changeset patch # User Mikael Berthe <mikael@lilotux.net> # Node ID a08808d8ffd811c1174216c598da5c27d20bc2c9 # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d hg clone stored path fix The abspath() has been lost in changeset 634 (da5378d39269).

Make consistent use of str.startswith() in conditionals. # HG changeset patch # User chad.netzer@gmail.com # Node ID 45db196de89a15fd045cd789f701b0180fd276f1 # Parent fafc16f705b6cb413897577b67918af55e1baafe Make consistent use of str.startswith() in conditionals.

Change MANIFEST.in to recursive-include the contrib/ folder. # HG changeset patch # User Andrew Thompson <andrewkt@aktzero.com> # Node ID e5dc09266c217bc50b91d710a045c679411e4727 # Parent c55df1c38618035c8e94e7af025e2b7f38f6d743 Change MANIFEST.in to recursive-include the contrib/ folder. Now sdist picks up git-viz again.

More IE friendly diff output related templates. # HG changeset patch # User Edouard Gomez <ed.gomez@free.fr> # Node ID 6eee9b54c53c41643192c7920db642c984a00a21 # Parent 8b8f710bb65875d588044c3615cf42180aee23ff More IE friendly diff output related templates. I thought i could use CSS to render properly the diff blocks in IE. But i was obviously too optmistic and didn't realized that IE only renders preformated text for pre tag content... So i had to rollback some of my changes to accomodate to this IE bug/limitation. A diff blocks become pre tags, and diff lines become span again. Hopefully, the pages continue validating.

Move hgrc documentation out to its own man page, hgrc(5). # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9 # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Move hgrc documentation out to its own man page, hgrc(5). The new man page expands on the existing documentation by describing the file format and the purpose of each section and field.

Move .hg into ignore()

.hgignore speedups patch incorporating Matt's feedback. # HG changeset patch # User mwilli2@localhost.localdomain # Node ID c78a9d4398c63b6bc689e456e1cab3850a846c8a # Parent 8c89408a7154d2da94766e957a088407fd0fef93 .hgignore speedups patch incorporating Matt's feedback.

Dont trap SIGHUP on the other OS # HG changeset patch # User Edouard Gomez <ed.gomez@free.fr> # Node ID 34a547cb33fe515ef4cdc8ccd173546671253ae9 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Dont trap SIGHUP on the other OS HG doesn't work anymore on the other OS since signals are trapped. This is due to the fact that as explained in Python docs not all signals are defined for all platforms, so python was complaning about missing signal.SIGHUP.

A number of minor fixes to problems that pychecker found. # HG changeset patch # User mark.williamson@cl.cam.ac.uk # Node ID 55d38977b7f2e73b8c1090179928ac96c8922b90 # Parent b3bba126b04ab2f24274a1bcf5a224c6317c8e0d A number of minor fixes to problems that pychecker found.

hgeditor: Remove EMAIL default for HGUSER, comment editor selection # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID a4c688c8273e392b1bf33cfc736e00ec752a415e # Parent be12687d4bf0ce16c4207bef85c188de66efbf53 hgeditor: Remove EMAIL default for HGUSER, comment editor selection HGUSER is already set to EMAIL by Python code if needed

hgeditor: Remove temporary files even if interrupted # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 1292f1fd015767d9682ba2ff5f8377fb6760c3a5 # Parent a4c688c8273e392b1bf33cfc736e00ec752a415e hgeditor: Remove temporary files even if interrupted Index: hg/hgeditor ===================================================================

hgeditor: Simplify manifest hash adding # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID be12687d4bf0ce16c4207bef85c188de66efbf53 # Parent 341d27f865903223f8bf12382e3596167228a1c1 hgeditor: Simplify manifest hash adding I hope no one will miss the colon.

hgeditor: Fix some parameters to commands # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 341d27f865903223f8bf12382e3596167228a1c1 # Parent 5c5d1484b51a53918575a199ab8985160f0ce2d7 hgeditor: Fix some parameters to commands

Pass username to hgeditor, remove temporary file # HG changeset patch # User Radoslaw "AstralStorm" Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 5c5d1484b51a53918575a199ab8985160f0ce2d7 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Pass username to hgeditor, remove temporary file

Add rss tag in the changelog/filelog html template. # HG changeset patch # User kreijack@inwind.REMOVEME.it # Node ID 20edcc82038fce8460076ca5723fbbb919016356 # Parent 8c89408a7154d2da94766e957a088407fd0fef93 Add rss tag in the changelog/filelog html template. This patch add rss tags in the changelog/filelog template html pages. This tags permit the browser to detect the rss feed.

Move commit hook after commit completes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move commit hook after commit completes manifest hash: bc65b570af67ee4748efaba2ff8a6cddf91b8a14 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0ZwSywK+sNU5EO8RAuAjAJsHGTXsOCnxq+xbq/Q0H+ayGnzaiQCfdWn6 or+IWK3sjYILYncTxMFZJdE= =mQb7 -----END PGP SIGNATURE-----

Whitespace cleanup -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Whitespace cleanup manifest hash: 7abcbe23247dd5b7dea6fa44fb80d9f909cf6829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0ZvmywK+sNU5EO8RAhhDAJ0YXOx5B2F/3NjFB+5YcUtkHqVyuQCgnNyp tWbRrjDz/SbKz/tFAsxJDqo= =xB66 -----END PGP SIGNATURE-----

Generate a friendlier except for failed lookups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Generate a friendlier except for failed lookups manifest hash: 1a4384b791bba2107604e56168166dfcbfb54086 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0Ws6ywK+sNU5EO8RArBGAJ9EA0mCNGqO+w6LaO358sVe19o7lQCdGffF MmQ/ZIvxoJOjYTo+PLBWMqI= =4VIg -----END PGP SIGNATURE-----

dirstate.forget() takes a list -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 dirstate.forget() takes a list manifest hash: e444474a5ac76d3562ee8c0211e1a88ec53155ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0WO+ywK+sNU5EO8RAlmYAJ9pcSgpvvuqLzfUkeApXZyOb3j6pQCgi9Te e8ZI236WNWfyrwEASxFIeLM= =yDVZ -----END PGP SIGNATURE-----

Warn about bogus ignore expressions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Warn about bogus ignore expressions manifest hash: 7beb33a1f0879a1d2457953187a523417bc7a101 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFC0IPqywK+sNU5EO8RAsOdAJ0bFxZoUjSk/BxWZ9C50SlxlDBlBQCeKbu0 QVzZZKIFlDRVWOsi8zfamHA= =zAVL -----END PGP SIGNATURE-----

Fix out of range regression -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix out of range regression From: Filip Brcic <brcha@users.sourceforge.net> The old revlog.py issued "index out of range" error when cloning the repository Now I have reverted the parts of revlog.py to the old state when prev was initialized as -1 and later assigned self.tip() only if that is possible. Previously prev was always initialized as self.tip() and that is where the out of range error was. manifest hash: c94c9aee8b6d382ef52c3981f306a6e7e5f4c4d1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzzIxywK+sNU5EO8RAtlcAJ0TX9FXuC2c3YHuYXNwqZhdzPWUlgCggq+a yJzUKDKH/gvnD3Tx3jcmCn8= =euPi -----END PGP SIGNATURE-----

Make cloning by hardlink quiet again -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Make cloning by hardlink quiet again manifest hash: bd12b4deedb99e06415619f858b95b566a6d329e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzvGGywK+sNU5EO8RAiCzAJ9iCRbyijLT7PqkgCI9eFn+9pl+KQCfdcB1 yHxfvLCL39wAAcBo6Hebpvo= =qne+ -----END PGP SIGNATURE-----

Fix corruption resulting from skipping parts of a revision group -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix corruption resulting from skipping parts of a revision group We were occassionally losing track of what revision a delta applied to when we skipped over deltas we already had and applying the delta against the wrong base. This could result in coredumps from mpatch, consistency errors, or failed verify. manifest hash: fcf20a8abfd81f08fae2398136b2ed66216b2083 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzu5SywK+sNU5EO8RAi10AJ9cqIfQzOzbcdH36t1LR/rY+UMtHwCeM79p Dtv+Jh0McLZr6nf4iJyhDgI= =5o6U -----END PGP SIGNATURE-----

Non-grouping regex for ignore -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Non-grouping regex for ignore Suggested by Mark Williamson manifest hash: dfd4686e7ac9f96e79da600edf299ed64213e05d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjX3ywK+sNU5EO8RAnc1AJ4/sKzyZJiRs6UzE3uksE2U9rOkVQCeJsZf PhHsNtEt/WyL+v44mBfk8Mk= =e+Qy -----END PGP SIGNATURE-----

Fix an odd revlog bug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix an odd revlog bug If revlog had a cached -empty- revision, as opposed to no cached version, it could get confused. This cropped up in verify on a particular repo. manifest hash: 90ccf122087f6bbcb4322cb9d9bb8124610ba886 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjRaywK+sNU5EO8RAgVEAKCv3WBJt1rBOX0UlTDXFPygPIru+gCfTZxJ CEz1lYny1gkQ+haGY26QdBs= =C/K5 -----END PGP SIGNATURE-----

Fix bug in reverting deleted files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix bug in reverting deleted files Force updates and reverts wouldn't restore deleted files in the working dir. This should fix that. manifest hash: e14809399bbc63da42e8c8f694cc8acf31e537f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzjOJywK+sNU5EO8RAqVLAKCC1BF6JhNiO6n4LJGvy9RBTgOelwCdF9Tr sADRnovYt9xSnUGmd1Om9JQ= =SdcP -----END PGP SIGNATURE-----

Experimental ignore regex speed-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Experimental ignore regex speed-up manifest hash: c6922086fb78201b60ba8cbde5b51512225ebcc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzWkvywK+sNU5EO8RAohzAJ9BwkFJQzs0QRH71r1Y1Wm0QCSmEwCgrESQ Ej3Kt/y0JdhOJzQLsAiufqk= =SPjY -----END PGP SIGNATURE-----

Attempt to read all remaining remote output at close -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to read all remaining remote output at close manifest hash: e1eda33686726559849388b048a838933862fe89 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM60ywK+sNU5EO8RAudsAJwPW/MPUBXFV13UbYmZyiwdzSr8QwCfYJqc l1ZDWPZPTN5UGUlfs0CCu7Y= =2Tat -----END PGP SIGNATURE-----

update test-hup permissions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update test-hup permissions manifest hash: a041df3958fb7508e34ce7c736c196217bbcf8a7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCzM2SywK+sNU5EO8RAnKvAKC1+ilD53KpBwplk5iaUMra4h3GDgCgsM4f R+RswPBjW8I51vNyvZ45AvM= =dQjV -----END PGP SIGNATURE-----

Show remote client output with "remote:"

this patch permits hgweb to show the deleted files in the changeset diff # HG changeset patch # User kreijack@inwind.REMOVEME.it # Node ID 08b33970007e753f12b2b2f9d0e169981a6e8c3c # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 this patch permits hgweb to show the deleted files in the changeset diff

Performance enhancements for manifest.add() # HG changeset patch # User mason@suse.com Performance enhancements for manifest.add() Improve manifest.add performance by using bisect to insert/remove changed items into the manifest list. This also generates the manifest delta directly based on the changes being made.

typo in help message. From: "Aneesh Kumar K.V" <aneesh.kumar@hp.com>

Update tests

Catch SIGHUP This should reduce the chance that a repo we're connected to via ssh gets interrupted without doing rollback.

Switch push over to the new scheme Now push works transparently with any repo with lock and addchangegroup. Currently this is local repos and ssh.

Add addchangegroup to the ssh protocol

Add a scheme for handling remote locking This adds an object that remembers to unlock the remote repo on destruction and lock/unlock functions for the ssh protocol. The remote repository should also unlock itself when the connection goes down.

Fix up the broken bits in findoutgoing

Move the empty changeset detection out of findincoming to pull This lets us reuse findincoming for findoutgoing

Protocol switch from using generators to stream-like objects. This allows the the pull side to precisely control how much data is read so that another encapsulation layer is not needed. An http client gets a response with a finite size. Because ssh clients need to keep the stream open, we must not read more data than is sent in a response. But due to the streaming nature of the changegroup scheme, only the piece that's parsing the data knows how far it's allowed to read. This means the generator scheme isn't fine-grained enough. Instead we need file-like objects with a read(x) method. This switches everything for push/pull over to using file-like objects rather than generators.

Add a repo method to report repo device This is used to establish whether repos are on the same device for hard linking. Remote repos all return -1.

Slim down and update README a bit

Provides output option to cat command # HG changeset patch # User thananck@yahoo.com # Node ID c838b9c2c71b1d64b8bde786f6470b30f23962de # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Provides output option to cat command expand function in commands.doexport is moved to toplevel and renamed to make_filename. The 'cat' command now accecpts --output <pattern> switch to specify the destination file. Index: hg/mercurial/commands.py ===================================================================

Update documentation of hg tag # HG changeset patch # User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> # Node ID 8fc9bfabae06cba91b05c265545bcce2654dab2f # Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269 Update documentation of hg tag This updates the FAQ, manpage and adds hg tag to the list of commands in README. Index: hg/README ===================================================================

Remove debug print from locate code. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 5240abb57899b745f2e6465be29d9d54c4777364 # Parent 13b74665cbdf735a91f231956d0fe73e446340ea Remove debug print from locate code. Index: hg/mercurial/commands.py ===================================================================

Clarify man page entry for locate a little. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID 13b74665cbdf735a91f231956d0fe73e446340ea # Parent fb74eaa2b5b763ad5591b2e51dbb377bf8342064 Clarify man page entry for locate a little.

Use repo.getcwd() in a few obvious places. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID fb74eaa2b5b763ad5591b2e51dbb377bf8342064 # Parent ebf5eba347a17a5c09000b3342caf350cd060a1b Use repo.getcwd() in a few obvious places.

Add locate command. # HG changeset patch # User Bryan O'Sullivan <bos@serpentine.com> # Node ID ebf5eba347a17a5c09000b3342caf350cd060a1b # Parent d2994b5298fb20f87dc1d4747635b280db3c0526 Add locate command. Used for finding files with names that match specific patterns, such as "*.c". This patch also introduces localrepository.getcwd, which returns the current directory relative to the repository root.

Fix quoting for RSS links Spotted by Mikael Berthe <mikael.berthe@lilotux.net>

Cleanups for repo.pull Use repo.pull in pull and clone commands Teach clone about ssh:// (temporarily) Fix up shutil issue on failed pull

Add an sshrepository class and hg serve --stdio

Change remote repository to httprepository

Add generic repo commands for pull and push

Add a function to calculate the outgoing changegroup

Attempt to handle RSS URIs properly -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Attempt to handle RSS URIs properly manifest hash: 1546939c11a8640ca56f0b0f5c7bdc878b4faa67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCycliywK+sNU5EO8RAukgAJ9eoJdqTiTQ8xSsSeHMIBmHnnQk9QCfQpFL SAJKUYknvv4IJDUyHjQc61k= =zGdJ -----END PGP SIGNATURE-----