Sat, 04 Jun 2005 19:35:08 -0800 Sort tags in revision order
mpm@selenic.com [Sat, 04 Jun 2005 19:35:08 -0800] rev 257
Sort tags in revision order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Sort tags in revision order manifest hash: 23f33a4ece3d36e4387d9c096a87e3d758db0cbc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFConLsywK+sNU5EO8RAkBTAJ0c71AIsyi3YFyNIZTAMgEIMgEHNACggAKC YrPLqJ3nzAX/tLSprvR/SUY= =WTsq -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 19:21:13 -0800 minor fixes for update()
mpm@selenic.com [Sat, 04 Jun 2005 19:21:13 -0800] rev 256
minor fixes for update() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 minor fixes for update() manifest hash: ee88b90b933d83d5a9e108ec5519da93629bf29b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCom+pywK+sNU5EO8RAqOxAJ9Cbk8NTlFAmlF3phcmz9MlaVYRuwCdGDjC oMFBjhRhvif/nBJbHjqW2Qw= =RN0T -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 19:09:00 -0800 hg help: use docstrings only
mpm@selenic.com [Sat, 04 Jun 2005 19:09:00 -0800] rev 255
hg help: use docstrings only -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg help: use docstrings only Now all Mercurial commands are at least partially self-documenting manifest hash: 177e5f0fb13c258cc56d9b42cf762e55c3141531 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFComzMywK+sNU5EO8RAr3dAJ0dtlW4h7xZgaj1T3lchPnO2HHb/QCfcSnJ e3SRVwd8DjsfxHFNQfOx+Qk= =+6jb -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 18:34:35 -0800 unify checkout and resolve into update
mpm@selenic.com [Sat, 04 Jun 2005 18:34:35 -0800] rev 254
unify checkout and resolve into update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 unify checkout and resolve into update This replaces checkout and resolve with a single command: $ hg help co hg update [node] update or merge working directory If there are no outstanding changes in the working directory and there is a linear relationship between the current version and the requested version, the result is the requested version. Otherwise the result is a merge between the contents of the current working directory and the requested version. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates are allowed. manifest hash: 513d285d7fb775d0560de49387042a685ea062f7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC YBldZtA7yIuTnV2vIbn7OSE= =QtM/ -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 15:16:48 -0800 Remove invalid state from dirstate
mpm@selenic.com [Sat, 04 Jun 2005 15:16:48 -0800] rev 253
Remove invalid state from dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove invalid state from dirstate It's no longer needed now that we backup and restore dirstate properly manifest hash: 74c98540d685a76bd95dd7ebf4aaeff678706952 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojZgywK+sNU5EO8RApaEAKCXO9Tl5h8vAC7GcQyUCx+feFExyACaAjfp 2hWiAJ9+B7EQgx2BJFE9Xek= =apay -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 15:14:39 -0800 Handle unknown commands nicely
mpm@selenic.com [Sat, 04 Jun 2005 15:14:39 -0800] rev 252
Handle unknown commands nicely -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Handle unknown commands nicely manifest hash: 787091fe5d983cdcd12491daaaf3cf60e9e950cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojXfywK+sNU5EO8RAlniAJ4gow9qBZ80Rvv8J3Rp8Ow2J/HOzwCglI3z Ra50GpqCglTuqWvPcBNfdMQ= =2s1i -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 15:14:11 -0800 backup dirstate for undo
mpm@selenic.com [Sat, 04 Jun 2005 15:14:11 -0800] rev 251
backup dirstate for undo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 backup dirstate for undo manifest hash: 2999407c1f8999e91ba0e23828cb406803b364a5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCojXDywK+sNU5EO8RAotIAKC3P3Oz+9n/EgqkFc0UMTlUErSNAQCgpjYm hpuZlC4lNO6aRiDfPVDL8Cw= =DDtT -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 14:25:08 -0800 Catch broken pipes in command interpreter
mpm@selenic.com [Sat, 04 Jun 2005 14:25:08 -0800] rev 250
Catch broken pipes in command interpreter -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Catch broken pipes in command interpreter manifest hash: b1550ec705836af571bf0c0921d9e768ac5e5e80 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoipEywK+sNU5EO8RAg2WAKCu3NUArYzOX2UwGj8pv3AnDQCwoQCffPWk RcaNt0+COwST2FlbQQOxEk8= =jbZG -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 14:16:32 -0800 import and startup cleanups
mpm@selenic.com [Sat, 04 Jun 2005 14:16:32 -0800] rev 249
import and startup cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 import and startup cleanups add commands:run() add copyright notice to commands eliminate/reorganize imports to speed up start time: 0.5b: $ time bash -c 'for i in `seq 100`; do ~/bin/hg > /dev/null; done' real 0m7.718s user 0m6.719s sys 0m0.794s new: $ time bash -c 'for i in `seq 100`; do hg > /dev/null; done' real 0m2.171s user 0m1.684s sys 0m0.444s just python: $ time bash -c 'for i in `seq 100`; do python -c pass; done' real 0m0.988s user 0m0.771s sys 0m0.207s Ignoring the fixed cost of loading the Python interpreter, we're 5.6 times faster. With the Python load time, we're still 3.5 times faster. manifest hash: acce5882a55c76eb165316f5741724c8ce4ef587 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoihAywK+sNU5EO8RAqMdAJwMe6Ur0R9G6jjayNa5hH2C3c4k/gCeIYvc N178vaWWGciX9zq+g5qCAls= =buhv -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 13:45:31 -0800 migrate remaining commands
mpm@selenic.com [Sat, 04 Jun 2005 13:45:31 -0800] rev 248
migrate remaining commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 migrate remaining commands This removes basically everything from the top-level hg script manifest hash: 34883e89d8def30e28936b38a9342d2f650f4c94 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoiD7ywK+sNU5EO8RAh0cAKCeOO9vahYs0tGmMNKk8bflw35p2wCgr6Wr y0SNLHSVBMCzXtC9zlfDPog= =3nJx -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 12:24:23 -0800 migrate verify
mpm@selenic.com [Sat, 04 Jun 2005 12:24:23 -0800] rev 247
migrate verify -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 migrate verify Move the bulk of the verify code into the localrepository class and move the command into commands.py manifest hash: 793a8d0094d56ab0a411cd11d7fe7f39c923f209 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCog33ywK+sNU5EO8RApfBAJ4mCmiMmZE1fEfbR6sA+aP1csPvqQCfXHzY 3XK7yc19AivXf5HGKEOL3eM= =GISf -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 12:14:14 -0800 Migrate rawcommit, import, export, history, and merge
mpm@selenic.com [Sat, 04 Jun 2005 12:14:14 -0800] rev 246
Migrate rawcommit, import, export, history, and merge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Migrate rawcommit, import, export, history, and merge manifest hash: f932108ee40e34b460e94b6fe60d6a06ac9f760c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoguVywK+sNU5EO8RAtohAKCe9Qr5R+YeLRluJlTxRGrJW/nnoQCfW/+F I0BSOeNpb6jdUxTZY1jV0xo= =hNXm -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 11:18:56 -0800 big heap of command clean-up work
mpm@selenic.com [Sat, 04 Jun 2005 11:18:56 -0800] rev 245
big heap of command clean-up work -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 big heap of command clean-up work Migrate add, forget, remove, commit, diff, addremove, tip, log, recover, and serve. Fix up filterfiles, relfilter, and relpath to be a bit more bulletproof Alphabetize functions and the command table Make everything in commands.py relative-path aware manifest hash: f0856031a7be4e49289677b467f29bcf24ebce4a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCof6gywK+sNU5EO8RAoW1AJsHu8vchPSjls7wVbvsq/UKlGhqtgCgtnnl xSBxyf/TEVWjHIk3uTa8WSE= =YPMl -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 11:13:25 -0800 root relative IO and valid commit states
mpm@selenic.com [Sat, 04 Jun 2005 11:13:25 -0800] rev 244
root relative IO and valid commit states -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 root relative IO and valid commit states do all working dir manipulation relative to localrepository.root change the valid commit states manifest hash: def7de4dfb4cad1fd4ef6f713fa3b5c903e05c58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCof1VywK+sNU5EO8RArEVAJ9F/zFYqRvS2dWxOhONCm1OjEjILQCfcmDq ARbGkSFSyVmyUSBSEq4n//E= =qIEI -----END PGP SIGNATURE-----
Sat, 04 Jun 2005 11:10:42 -0800 fix heads for rev 0
mpm@selenic.com [Sat, 04 Jun 2005 11:10:42 -0800] rev 243
fix heads for rev 0 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix heads for rev 0 manifest hash: 7b2f4607f6c54b660d63ac35ba953576464e1511 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCofyyywK+sNU5EO8RAjkeAJ4rfOQ9HV+gpndsTzuoS6R3f+mzEQCfcb0P IWhTz6XDpTWEkjzcK++mZ4k= =mINY -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 18:42:53 -0800 hgmerge: use diff3 if available
mpm@selenic.com [Fri, 03 Jun 2005 18:42:53 -0800] rev 242
hgmerge: use diff3 if available -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgmerge: use diff3 if available diff3 may be more readily available than merge manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk xZlQHYIGrCLOFQiCQxIfr7I= =Asv9 -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 18:29:46 -0800 Resolve bits from TAH
mpm@selenic.com [Fri, 03 Jun 2005 18:29:46 -0800] rev 241
Resolve bits from TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Resolve bits from TAH manifest hash: dc639d419de857b22da9f707cbb557c328eb12f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRIaywK+sNU5EO8RAswQAKCiEcQ5RV3C2JZXgQBch28VO3NpSgCdEzcD Td8bV8IKVUIXtvrcy1rCZTY= =tAU7 -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 18:27:55 -0800 Replace tkmerge with hgmerge
mpm@selenic.com [Fri, 03 Jun 2005 18:27:55 -0800] rev 240
Replace tkmerge with hgmerge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace tkmerge with hgmerge hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch. hg will use hgmerge unless overridden with HGMERGE manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP vYI6qlyWKQZ01ObUTAIg92o= =+mRH -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 13:44:34 -0800 mdiff.py: kill #! line, add copyright notice
mpm@selenic.com [Fri, 03 Jun 2005 13:44:34 -0800] rev 239
mdiff.py: kill #! line, add copyright notice -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 mdiff.py: kill #! line, add copyright notice manifest hash: acb4e14d5947d0fde5b89a874af0476773ee1cee -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoM9CywK+sNU5EO8RAizVAJ41dqQxxx8nouBxJMcFmoVRRo4GfACbB9RV Xc0cqaoPVL7p87opPKjgNWw= =HyjH -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 13:43:17 -0800 hgweb.py: kill #! line, clean up copyright notice
mpm@selenic.com [Fri, 03 Jun 2005 13:43:17 -0800] rev 238
hgweb.py: kill #! line, clean up copyright notice -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb.py: kill #! line, clean up copyright notice manifest hash: a2910abe3f58687ccf55179ab37f66dee2b6e775 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoM71ywK+sNU5EO8RAil4AJ9edZ1FJ0WbikVBYBMNO+MldBRqnACfRtuH Nw/BuBueQfEhaI3i+9+Q9/g= =vV8+ -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 13:32:37 -0800 Merge from tah
mpm@selenic.com [Fri, 03 Jun 2005 13:32:37 -0800] rev 237
Merge from tah
Thu, 02 Jun 2005 09:23:44 +0100 Removed extra closing brace from date string.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 09:23:44 +0100] rev 236
Removed extra closing brace from date string.
Thu, 02 Jun 2005 09:14:12 +0100 Obfuscate author in all HTML templates.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 09:14:12 +0100] rev 235
Obfuscate author in all HTML templates.
Thu, 02 Jun 2005 07:06:29 +0100 ui.warn can use more than one argument like the other ui methods.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 07:06:29 +0100] rev 234
ui.warn can use more than one argument like the other ui methods.
Thu, 02 Jun 2005 07:05:56 +0100 Add missing > to </td> in templates.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Jun 2005 07:05:56 +0100] rev 233
Add missing > to </td> in templates.
Fri, 03 Jun 2005 12:58:47 -0800 hg resolve: merge a given node into the working directory
mpm@selenic.com [Fri, 03 Jun 2005 12:58:47 -0800] rev 232
hg resolve: merge a given node into the working directory -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg resolve: merge a given node into the working directory This is the first pass at working directory-based merges. Doing a resolve adds a second parent to the working directory state for the next commit. manifest hash: 827b19995dd2d7686286da3b62c7d5fe3e0bc48c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMSHywK+sNU5EO8RAnOkAJsHH9jviMJcQJ4JurFuSlrbIwKqRACdHgNC kkfoAxX2E5jkuOeSJ1Hjalk= =bdrT -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:56:50 -0800 add 'm' state to dirstates
mpm@selenic.com [Fri, 03 Jun 2005 12:56:50 -0800] rev 231
add 'm' state to dirstates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add 'm' state to dirstates This state indicates that a file has been merged with resolve and must be in the next commit. manifest hash: dc90629b73056b671f7be3de0283039c96c9ca0f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMQSywK+sNU5EO8RAuxHAKCHckvSiLwegl5hbF5x5EeQg0MA2gCcCYD+ 78Ol99Y9nk5ZA2bbYgM+AQw= =vMOg -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:55:56 -0800 make diffdir default to dirstate.parents()
mpm@selenic.com [Fri, 03 Jun 2005 12:55:56 -0800] rev 230
make diffdir default to dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 make diffdir default to dirstate.parents() update various diffdir users to use default manifest hash: aeca2b9da1aca278dd5e3f27cc2906667803577d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMPcywK+sNU5EO8RAkY8AJ90UHQXnJnkG9PJKG7IsgPeOZ2WZACgiarS HhS2zX3TRM9WdZHo5nLvZGw= =7YyP -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:54:54 -0800 teach commit about dirstate.parents()
mpm@selenic.com [Fri, 03 Jun 2005 12:54:54 -0800] rev 229
teach commit about dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 teach commit about dirstate.parents() manifest hash: 89374a15a1e680a251f1a084c18136cb27ad2b42 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMOeywK+sNU5EO8RAj6rAJ9NBf0401gAlzA315m7gaEPeteaewCfe6A4 Bn3nm77acgIukB1ePfK1o1Y= =P2y2 -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:54:14 -0800 teach rawcommit about dirstate.parents()
mpm@selenic.com [Fri, 03 Jun 2005 12:54:14 -0800] rev 228
teach rawcommit about dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 teach rawcommit about dirstate.parents() manifest hash: 776f28b896f8de8c39c9edb0956faca78c1a827a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMN2ywK+sNU5EO8RAnJpAKCh5MVSMNlk1GRYPm7IOavhurYPLgCfYc9w k4bTiV62lgoyItdmkynS1Jg= =gVyk -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:46:38 -0800 move repo.current to dirstate.parents()
mpm@selenic.com [Fri, 03 Jun 2005 12:46:38 -0800] rev 227
move repo.current to dirstate.parents() -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 move repo.current to dirstate.parents() dirstate now tracks the parents for the working dir add a parents command to show them manifest hash: cd69237838c3f69f7937723c4a6803d47cb27cfa -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMGuywK+sNU5EO8RAg5UAKCVLUrsJtkoIOTM+e0BLqEVN3Ni3gCeNDyy ZF8jD728cl9K7S4sIN4gX4Y= =P4bu -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:45:04 -0800 merge: don't bail on outstanding changes
mpm@selenic.com [Fri, 03 Jun 2005 12:45:04 -0800] rev 226
merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:44:01 -0800 fix repo locking
mpm@selenic.com [Fri, 03 Jun 2005 12:44:01 -0800] rev 225
fix repo locking -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix repo locking We've actually got to assign the lock to a local variable, otherwise it gets released immediately. manifest hash: d55fc8858649c59ed9fa1f8cb90b63b33a71c223 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMERywK+sNU5EO8RAgqwAKCPhmTOK/n5bjJ6Xh4mC9Q8mJDx4wCfZBGX Uik+3sUcQRqgHjsP0fIjjiU= =U1p0 -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:43:16 -0800 fix bad assumption about uniqueness of file versions
mpm@selenic.com [Fri, 03 Jun 2005 12:43:16 -0800] rev 224
fix bad assumption about uniqueness of file versions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix bad assumption about uniqueness of file versions Mercurial had assumed that a given file hash could show up in only one changeset, and thus that the mapping from file revision to changeset was 1-to-1. But if two people perform the same edit with the same parents, we can get an identical hash in different changesets. So we've got to loosen up our uniqueness checks in addgroup and in verify. manifest hash: 5462003241e7d071ffa1741b87a59f646c9988ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMDkywK+sNU5EO8RAg9PAJ9YWSknfFBoeYve/+Z5DDGGvytDkwCgoMwj kT01PcjNzGPr1/Oe5WRvulE= =HC4t -----END PGP SIGNATURE-----
Fri, 03 Jun 2005 12:40:32 -0800 add back tempfile import
mpm@selenic.com [Fri, 03 Jun 2005 12:40:32 -0800] rev 223
add back tempfile import -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add back tempfile import manifest hash: e6673585d42d0992230d23c8334a9e26eb94d34a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMBAywK+sNU5EO8RAvTAAKCwlVzxvm9enBR+xMmkj2aRMEYkkwCfXUqT SlEdijBZ9fnktzxadp7/evU= =uL7e -----END PGP SIGNATURE-----
Thu, 02 Jun 2005 18:46:49 -0800 make pull work for multiple heads
mpm@selenic.com [Thu, 02 Jun 2005 18:46:49 -0800] rev 222
make pull work for multiple heads -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 make pull work for multiple heads add repository.heads() teach remoterepository and hgweb about heads command teach getchangegroup about multiple heads break apart addchangegroup and merge (cleaning up merge saved for later) after this change, it is now possible to pull and get multiple heads, but not possible to merge the heads manifest hash: 86fe3ede296254698fdd4c97df02944993ef2cbb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn8SZywK+sNU5EO8RAkSvAJ9NOA4UZ3cFyyzymlYBZnV+PpGRcACeLL+R PFaSgJHGKvxsXpvPYiZA0O0= =L2Xr -----END PGP SIGNATURE-----
Thu, 02 Jun 2005 18:07:01 -0800 Beginning of multi-head support
mpm@selenic.com [Thu, 02 Jun 2005 18:07:01 -0800] rev 221
Beginning of multi-head support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Beginning of multi-head support Add revlog.heads() Add heads command to list changeset heads manifest hash: 50df6fffe59a40c19782e2c77c8077db026fde67 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn7tFywK+sNU5EO8RAusWAJ9EojIxgqEEt8VZd5S+5Laj8tHV+ACfWLb5 TC7AnsoFGg50jAWF0EsofDA= =nzyH -----END PGP SIGNATURE-----
Thu, 02 Jun 2005 17:39:29 -0800 change dircache into dirstate
mpm@selenic.com [Thu, 02 Jun 2005 17:39:29 -0800] rev 220
change dircache into dirstate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 change dircache into dirstate The dircache now tracks adds and removes directly diffdir now makes a proper distinction between added and unknown files Add a forget command to unadd files Undo tries to fix up the state of just the files in the undone commit Add and remove complain about files that are not in a proper state of existence manifest hash: ca0cd6abc5e119670acf11a54fefa2bc986eadf3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCn7TRywK+sNU5EO8RAhnSAKC2oHg1HJOCGsvpUYj4SBEq0HmuJQCgr5gl jEBTs5AFD5IhF73YAgrcnkE= =prQA -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 19:19:38 -0800 hg checkout: refuse to checkout if there are outstanding changes
mpm@selenic.com [Wed, 01 Jun 2005 19:19:38 -0800] rev 219
hg checkout: refuse to checkout if there are outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg checkout: refuse to checkout if there are outstanding changes This is a stop-gap until I make the working dir logic smarter manifest hash: a3f6adcb7eecec294000039057d59771958f4186 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnnrKywK+sNU5EO8RAtqBAJwPQQrW5GhjMP9HMkFtfD7qhqxIcgCfXvA4 oXHO13uzBn5JOaTH3KwsMbQ= =IzTY -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 17:01:09 -0800 hgweb: put map-raw in setup.py and MANIFEST.in
mpm@selenic.com [Wed, 01 Jun 2005 17:01:09 -0800] rev 218
hgweb: put map-raw in setup.py and MANIFEST.in -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: put map-raw in setup.py and MANIFEST.in manifest hash: 75f24a191ade74c1cbfafbaaf5fb9b6a4c5da02c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnlpVywK+sNU5EO8RAoDGAKCsyEhpJGPZjRp4RZD1Q1ijwNGC2wCdGSjL IGWUxQqqS4W4GJNesvADNVs= =O3Wg -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 15:21:53 -0800 merge: catch unexpected responses
mpm@selenic.com [Wed, 01 Jun 2005 15:21:53 -0800] rev 217
merge: catch unexpected responses -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: catch unexpected responses This dumps the data received from the remote server in case we fail to parse its output. manifest hash: da5232649a0e02645bccd8b50665d9c3e247fdc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnkMRywK+sNU5EO8RApAGAKCw7ZHF4YUaTi3ychbUe5Lr47OsCwCfUqKg lxA/sgDmeDMbmwbV5S+Beik= =y6TB -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 15:15:07 -0800 hg annotate: actually annotate the given version
mpm@selenic.com [Wed, 01 Jun 2005 15:15:07 -0800] rev 216
hg annotate: actually annotate the given version -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg annotate: actually annotate the given version Bug spotted by Edouard Gomez manifest hash: 3e29a7a8eb70b92483958ceffe94045a82899c61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnkF7ywK+sNU5EO8RAvvnAJsFjkpFdzQ+cPyrvQE25V16/z3dBQCeIyzf S/N2S/RcfFd9Ca56Xvf/jAM= =0qMq -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 14:59:36 -0800 hgweb: import ui
mpm@selenic.com [Wed, 01 Jun 2005 14:59:36 -0800] rev 215
hgweb: import ui -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: import ui Fix from Edouard Gomez manifest hash: 6157f19523d28465a6f0c49adec96c17aa9df118 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnj3YywK+sNU5EO8RAgHBAJ0b+oHTOyDVDtC5vsQvAzpn0saRAACfYmAU 5q/mDghl/UWYGiSAY1i/l0w= =i9MB -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 13:04:13 -0800 catch TERM signal in command processor
mpm@selenic.com [Wed, 01 Jun 2005 13:04:13 -0800] rev 214
catch TERM signal in command processor -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 catch TERM signal in command processor This keeps kill from interrupting a transaction without cleanup. manifest hash: c50091696a3396dfed5c3168bd9e0d94c457a04b -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCniLNywK+sNU5EO8RAvepAKCCnEX7vPheIyOu2IvV6dDahdFMWACeMih6 E2R3rA/MGACxG9HpSNH6lak= =HR1s -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 11:48:34 -0800 commands: migrate status and branch
mpm@selenic.com [Wed, 01 Jun 2005 11:48:34 -0800] rev 213
commands: migrate status and branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: migrate status and branch manifest hash: 7d893a81a81539173fc74d86152062a1a70bed13 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnhESywK+sNU5EO8RAlBJAKCmv2gHefMOXfX/UUCy1tfV0cOqOQCfbeX8 oaT15B7GBL2lcalGrPXkzY8= =8gVe -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 11:11:19 -0800 commands: better argument processing, per-command help
mpm@selenic.com [Wed, 01 Jun 2005 11:11:19 -0800] rev 212
commands: better argument processing, per-command help -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: better argument processing, per-command help This passes command line arguments as positional arguments rather than as a list and attempt to catch exceptions if the arguments don't match up. It also adds 'hg help [cmd]' which prints the syntax and docstring for the given command. manifest hash: cef3ac7076f99fce4265a5dc7acb57fb03d93270 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnghXywK+sNU5EO8RAv+5AJ9MfCCRxE+pNu3i44v5I4IyQoRaiQCeNqEK wBzAiP+Q6F/9PL2xOrrZGHw= =EYdk -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 10:43:11 -0800 commands: fix up some help strings
mpm@selenic.com [Wed, 01 Jun 2005 10:43:11 -0800] rev 211
commands: fix up some help strings -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 commands: fix up some help strings manifest hash: e9e6061cd37d77e8061cab6a0cd3ca701e6900d7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCngG/ywK+sNU5EO8RAnhCAJ422e7LecJ5D/15I5PcQZxGvsgvvQCeOWIb 7LTyyAYDeht6yOQCdLWmXIE= =bjQG -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 10:40:19 -0800 hg undo: fixup working dir state
mpm@selenic.com [Wed, 01 Jun 2005 10:40:19 -0800] rev 210
hg undo: fixup working dir state -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg undo: fixup working dir state manifest hash: 60fd7a5621f7c4e87c7c36097aaf11b22e7ee0b4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCngETywK+sNU5EO8RAiC/AKChvIgy61YfOLJcTQg5BKkTLLErRgCgnJMr +xb+XsjeNfK+83MzeuE8UOk= =EIlj -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 00:25:42 -0800 Beginning of new command parsing interface
mpm@selenic.com [Wed, 01 Jun 2005 00:25:42 -0800] rev 209
Beginning of new command parsing interface -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Beginning of new command parsing interface This adds commands.py, with a primary interface dispatch(args) Dispatch searches a table of known commands, handles switches, sets up a repo object if appropriate, and dispatches the command. It also handles KeyboardInterrupt and can handle similar exceptions in the future. If the command is unknown, it falls through to the current command handler. Commands currently handled by the new scheme: help, init, and annotate manifest hash: 134cd032c880985e3f92f82efb8b629dd862ba4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnXEGywK+sNU5EO8RAuDAAJ9q7K4w7qGVWv1NWjCPFGO/UJc6VQCdEhMQ sBBlSRzah9QPy8K94catZyg= =wuRf -----END PGP SIGNATURE-----
Wed, 01 Jun 2005 00:21:38 -0800 revlog: remove some unnecessary imports
mpm@selenic.com [Wed, 01 Jun 2005 00:21:38 -0800] rev 208
revlog: remove some unnecessary imports -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 revlog: remove some unnecessary imports manifest hash: 63c887eceb54c8bd5a10692a905fb79079057246 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnXASywK+sNU5EO8RAkxVAJ92do7puoVbgHE2whbow4MGKKv4pQCeMmms bt2r/9oVoFclTh2dL3SaQ2Q= =Jeuv -----END PGP SIGNATURE-----
Tue, 31 May 2005 22:57:53 -0800 Move ui class to its own module
mpm@selenic.com [Tue, 31 May 2005 22:57:53 -0800] rev 207
Move ui class to its own module -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move ui class to its own module manifest hash: f75c8f9cdfe16f143ab633d0072c14ba88ac88be -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVxxywK+sNU5EO8RAgPgAJ48p7w4Do/saCC8WkBvHj/rdnoiEgCgrSs9 Wu1fOSgST3rn/2JpZAdFRdA= =91tt -----END PGP SIGNATURE-----
Tue, 31 May 2005 22:45:50 -0800 hg: don't complain about missing repo with no args
mpm@selenic.com [Tue, 31 May 2005 22:45:50 -0800] rev 206
hg: don't complain about missing repo with no args -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg: don't complain about missing repo with no args manifest hash: d8172c0b583d6f2ff60cf49e74c1247de8d9d673 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVmeywK+sNU5EO8RAj79AJ4wN1SwC8+e1amxv+EAd6VKhpXXYgCeIPDK iVX9Z0Ix8DiC3p8fquyhFwM= =c6EH -----END PGP SIGNATURE-----
Tue, 31 May 2005 22:40:31 -0800 README: integrate some changes from Kevin Smith
mpm@selenic.com [Tue, 31 May 2005 22:40:31 -0800] rev 205
README: integrate some changes from Kevin Smith -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: integrate some changes from Kevin Smith manifest hash: 7e3ca4be07fe9df4348d21b42771696a357c23d8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVhfywK+sNU5EO8RAtXvAJ4oclpYQm98YArUDbs7ZUfQspQpcACZAXf2 pMG7GKkquua+fS76uxpcCgs= =yPbJ -----END PGP SIGNATURE-----
Tue, 31 May 2005 22:17:34 -0800 README: integrate various changes and suggestions from Rafael Villar Burke
mpm@selenic.com [Tue, 31 May 2005 22:17:34 -0800] rev 204
README: integrate various changes and suggestions from Rafael Villar Burke -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README: integrate various changes and suggestions from Rafael Villar Burke manifest hash: ce1999b3ffc19c1dca582355e32e1ea9b8d108f0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVL+ywK+sNU5EO8RAnfRAJ9eIlaxdzExbvQUlvaofk+aWMfzUgCfTmeb 4DfwOHsb8IreNXRs00jJtJI= =mt6J -----END PGP SIGNATURE-----
Tue, 31 May 2005 21:33:27 -0800 hg rawcommit command
mpm@selenic.com [Tue, 31 May 2005 21:33:27 -0800] rev 203
hg rawcommit command -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg rawcommit command From: Christopher Li <hg@chrisli.org> This allows direct access to the commit command, primarily for importing from other SCMs. manifest hash: bea39fa8207582c9fa7ba0904721eb5113c61cf4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnUinywK+sNU5EO8RAhWqAJ9PiafRbfEIA3VsO07BbGZr5adNvgCfT2k7 blYTdkrIiRzzCxn6yPq8Yu4= =o8k0 -----END PGP SIGNATURE-----
Tue, 31 May 2005 21:24:14 -0800 Call python via env in hgweb.cgi
mpm@selenic.com [Tue, 31 May 2005 21:24:14 -0800] rev 202
Call python via env in hgweb.cgi
Tue, 31 May 2005 21:10:10 -0800 hgweb: add template filters, template style maps, and raw pages
mpm@selenic.com [Tue, 31 May 2005 21:10:10 -0800] rev 201
hgweb: add template filters, template style maps, and raw pages -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: add template filters, template style maps, and raw pages Template filters: in templates, you can now specify a chain of filters like #desc|firstline|escape# #desc|escape|addbreaks# #date|age# to specify how you'd like raw text (or whatever) to be transformed. Template style maps: add ;style=foo to a URL and we'll use templates/map-foo if it exists. Raw output: Together, these two features make it east to implement raw downloadable files and patches. Simply link to the same page with style=raw and present the output as unfiltered text/plain with that template. manifest hash: 5954a648b3d6b4e6dc2dcd1975f96b4b0178da2a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnUMyywK+sNU5EO8RAkKjAJ9h9JElSCbWBPUnL+koCSDxgo38AwCgrccM 0qwyKdh/fUNglICxSh3HBNA= =Svlo -----END PGP SIGNATURE-----
Tue, 31 May 2005 09:03:46 -0800 annotate: memory efficiency
mpm@selenic.com [Tue, 31 May 2005 09:03:46 -0800] rev 200
annotate: memory efficiency -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 annotate: memory efficiency Keep track of how many times a given ancestor is referenced and delete the annotation information after it's no longer relevant. This tends to reduce the number of cached revisions to just a couple. manifest hash: 281e48b67ce310e355bed1615e0f16a643850f56 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnJjyywK+sNU5EO8RAkZ1AKCugPjkRgwVB+71amZf8H5dLCbNvgCfePIB 4FHI1c9IOEzHUNkYPDGqt+0= =OnFo -----END PGP SIGNATURE-----
Tue, 31 May 2005 08:56:05 -0800 annotate: deal with merges
mpm@selenic.com [Tue, 31 May 2005 08:56:05 -0800] rev 199
annotate: deal with merges -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 annotate: deal with merges This rewrite of the annotate code deals with merges: - - find all ancestors - - sort ancestors topologically - - for each ancestor, pairwise annotate with parents - - keep a cache of annotations for efficiency manifest hash: b960d9b9c6a7f6ba351c97675b00a1dd3004dcf1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnJclywK+sNU5EO8RAphZAKCkUuHh4jEJz7YwD9uzCT76GaSR/wCfUVUQ VbGna/9jrOAFlrB3mZ3e4qg= =yDFy -----END PGP SIGNATURE-----
Mon, 30 May 2005 10:21:21 -0800 hgweb: fix tip so that it doesn't need refreshing
mpm@selenic.com [Mon, 30 May 2005 10:21:21 -0800] rev 198
hgweb: fix tip so that it doesn't need refreshing -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: fix tip so that it doesn't need refreshing manifest hash: 5bf1837a29c5612872ab206053f9d15e899e3664 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCm1mhywK+sNU5EO8RAjdQAKCLrRFv2/rfHYNI2tFvF5HKINaTjQCfRhxo ca39aZ0SaNeCBqc1nMPOTcw= =4pHG -----END PGP SIGNATURE-----
(0) -100 -60 +60 +100 +300 +1000 +3000 tip