mpm@selenic.com [Wed, 08 Jun 2005 10:59:18 -0800] rev 281
hg cat: relative file support
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg cat: relative file support
also fix a bug in relpath
From: K Thananchayan <thananck@yahoo.com>
manifest hash:
a443a66dfb90b38ea491de1e817b2877170bc9f8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCp0AGywK+sNU5EO8RAgfVAJ9vlXfLKs1A/TegG3wuPeuxoSQMCACbBPGF
RObiYj1st0k1zQYBlvSlQbk=
=GZbB
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 08 Jun 2005 10:52:01 -0800] rev 280
Mark the usual things executable
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Mark the usual things executable
manifest hash:
e55dde46fd1a97ce338c1ac71278b67ca9d96bf7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J
mFi9D3L9ULGO457NWB4h3kY=
=3bcD
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 08 Jun 2005 10:50:50 -0800] rev 279
permissions merge: remove a debugging print
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
permissions merge: remove a debugging print
manifest hash:
488144aeb1544ecc377ab41983e6cabd4a8b1f5f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpz4KywK+sNU5EO8RAi+YAKCBmiiDkhe2ygCv4LF21RS3/iH0VgCeLwd5
c/yhTklZ9lnLWXy5dmuPNZk=
=UtDf
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 08 Jun 2005 10:47:10 -0800] rev 278
unidiff: handle empty diffs more gracefully
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
unidiff: handle empty diffs more gracefully
manifest hash:
e2030f7e55dc333ba0cd5b0847d1f1a08e3c5d64
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpz0uywK+sNU5EO8RAnt4AJ9pyaS6/xNnlhCUocq3m0HbCwHJ/gCgrP/H
IvBJtq1eXvRedfitF25vBgw=
=pd5n
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 08 Jun 2005 10:46:39 -0800] rev 277
merge: update permissions even if file contents didn't change
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: update permissions even if file contents didn't change
manifest hash:
f24ed7970c6ca48329a7aa9c2037d96333f7172e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpz0PywK+sNU5EO8RArOMAJ9CImCJMdubq5HsB3KrxOt1EG7PEgCgpPWg
lnVxviZhv31EHtnxujQBoqM=
=qxYq
-----END PGP SIGNATURE-----
mpm@selenic.com [Wed, 08 Jun 2005 10:16:33 -0800] rev 276
add tracking of execute permissions
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
add tracking of execute permissions
Changes to executable permissions are now tracked. We only track one
bit here as the others tends to be problematic. "hg manifest" now
shows file permissions.
manifest hash:
b76b85d12a9550fdc9fbc4f9446a812f3a2bbe88
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpzYBywK+sNU5EO8RAgkMAJ48l
2ac12E20EFS24/i8ScwOtG4HwCgkbaE
ue6l1RJroqzNA7vNeqwCwK4=
=sEmJ
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 20:06:05 -0800] rev 275
various merge improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various merge improvements
add -C flag: force update and overwrite local changes
add -m flag: allow merges with conflicts
we no longer do merge by default
and we print a warning message when the merge fails
fix bug in printing merge failure message
fix bug diffing files in 'm' state
manifest hash:
75545a6db45d1e371082343d01c9f177df0f9db3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj
TiNsPIds560S5jgw44eWNto=
=GPXN
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 19:02:31 -0800] rev 274
[PATCH] hgk should parse dates in the diff output
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] hgk should parse dates in the diff output
hgk doesn't deal well with the difflib style diffs, it expects the filename
to be the last thing on the line. This patch fixes the regexp to stop
reading the filename at the first tab.
Signed-off-by: Chris Mason <mason@suse.com>
manifest hash:
9c5bcf427455dcf306ab6f91b1986723caa83f36
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpl/HywK+sNU5EO8RAgAjAKCOuZsRtJDbdurTQry+7krtLTtRQQCfXLuN
LZEFkcOGS0jiAC6vci/RLJ0=
=jkr1
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 19:00:56 -0800] rev 273
merge: Fix bug where we overwrote local when local was newer
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: Fix bug where we overwrote local when local was newer
Spotted by Arun Sharma
manifest hash:
b81acb971c6471d95748cd349590cc70e448dce3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpl9oywK+sNU5EO8RAtseAJ92EEMovbVy0J1rFuxcGvED066m+ACfaWYF
Q1/PcvkuH9aIqwMNkMK+aPU=
=61JM
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 08:53:05 -0800] rev 272
diff: use tab to separate date from filename
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
diff: use tab to separate date from filename
manifest hash:
73812de990e0e787320c11f7bd83c4ca91a52c4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpdDxywK+sNU5EO8RAhKwAKCFcUa/p6ALbjoOl4I8VKJknZtu7gCdFvoE
HQn1iq4gnJoeurB7YLMRpqc=
=ltYP
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 00:21:53 -0800] rev 271
hgweb: ignore pipe errors
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb: ignore pipe errors
manifest hash:
3a3baaa175a422bf499f414b5186ed551827db56
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVkhywK+sNU5EO8RAo5aAJ9KPR/Gwp8YBswhyKqzVYVlgBl49ACghr65
sGKxB7ctoX9XB1WDht8WUzk=
=J2bp
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 00:07:31 -0800] rev 270
Reverse order of hg log and hg history lists
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Reverse order of hg log and hg history lists
Suggested by Arun Sharma
manifest hash:
5f663a03e7ace601383c7291a17f83c9aeeccdda
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVXDywK+sNU5EO8RApeOAJsFXG0qeO+yidIwyPrBHSmDMaKfdwCeMAWl
uClUZxGNburRXmNLLAPHk9k=
=1ytE
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 00:04:43 -0800] rev 269
hgweb: shrink the default changelog list to 10
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb: shrink the default changelog list to 10
manifest hash:
4d5f9f35b3dcb6bf05c0f25ab89cedba269ad924
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVUbywK+sNU5EO8RAlmTAJ9HzQz9C1lmL22IGU0tXYDTLqcVAQCfTD1U
pDF449wXA8ocjAF+UUJ7sL8=
=YyBZ
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 00:03:38 -0800] rev 268
unknown command fixups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
unknown command fixups
from Andrew Thompson
manifest hash:
3ed1956585a905a52d93491ea95096be23c9acf8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVTaywK+sNU5EO8RAkvLAJ0ff8/kVQc93jGy5t1uJ5R8m0M4OACfZ1Ba
O7CldaLkwEzqybw/5iL6NAw=
=WGtU
-----END PGP SIGNATURE-----
mpm@selenic.com [Tue, 07 Jun 2005 00:00:56 -0800] rev 267
Initial import of hgit and hgk
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Initial import of hgit and hgk
Support for git compatibility sufficient to run gitk on top of hg
repositories. This includes:
hgit diff-tree
hgit rev-list
hgit rev-tree
hgit cat-file
Signed-off-by: Chris Mason <mason@suse.com>
hgk is a slightly modified version of gitk1.1 from Paul Mackerras. It has
been changed to use hgit commands, and has support for the extended
rev-list -c to speed up the commit listing.
Signed-off-by: Chris Mason <mason@suse.com>
manifest hash:
5a4a27135bc85bab2a3a1e35018a08a985d8d146
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVQ4ywK+sNU5EO8RAl3QAJ9p6VyZ8fCHfgt0p8ksgL2P215DXQCfZU47
d+u5GpZvkOTOc3+LU3Ny3nE=
=rjsC
-----END PGP SIGNATURE-----
mpm@selenic.com [Mon, 06 Jun 2005 23:57:00 -0800] rev 266
Fix argument processing for patch and rawcommit
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix argument processing for patch and rawcommit
manifest hash:
fc76fcd22ca69185bbec1855f72dda5b692e03f3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpVNMywK+sNU5EO8RAn2nAJ4gBbdn8K6xN55Igh6J2ZJEMgRGBACgr0Xb
KkjbnOrNL5uQmBHx59C7HdY=
=qsQi
-----END PGP SIGNATURE-----
mpm@selenic.com [Mon, 06 Jun 2005 10:52:19 -0800] rev 265
hgweb: fix non-existent source or destination for diff
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb: fix non-existent source or destination for diff
manifest hash:
c076bc00ba04911392085f3d0697106f4d24b808
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpJtjywK+sNU5EO8RAsaTAKCso0BDI3GQxN9ZZRNeMXjeZXCXLgCfYM+R
JpTBR7gUZtV+pEexSfFlRDQ=
=moF8
-----END PGP SIGNATURE-----
mpm@selenic.com [Mon, 06 Jun 2005 10:51:09 -0800] rev 264
Attempt to make diff deal with null sources properly
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Attempt to make diff deal with null sources properly
manifest hash:
7766ed2b885640157b93474b6e42573ec061fcfb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpJsdywK+sNU5EO8RAr5gAJ9sIik+3FDyI8UvIvrWlku4QgMZWQCcDFvh
MvtqY8pFYTFLp7tM2zzTlu4=
=a0oy
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 05 Jun 2005 10:50:03 -0800] rev 263
Fix empty repository transaction bug
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix empty repository transaction bug
manifest hash:
df334795ea545f2401d08f734b8b6933af053d7b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCo0lbywK+sNU5EO8RAr0TAJ9g9703187KXlpBOffNUGcYKGTLzwCgrqdq
jYjtTvZZ3nRCt8biaTcad3c=
=+riB
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 05 Jun 2005 10:48:39 -0800] rev 262
implement demand loading hack
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
implement demand loading hack
This attempts to speed up start-up times without pushing imports down
into local scopes.
manifest hash:
f9c18897e67f7872b44f5c89bdde00edfc3628ce
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCo0kHywK+sNU5EO8RAg5HAKCxRKAz3FXDyv4wScq1ZbwTgfPa2gCfW9K+
dg5nC3Uvp4FilP8waF6liAY=
=dolF
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 05 Jun 2005 10:42:52 -0800] rev 261
Update README
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update README
manifest hash:
6c869ba7478b4fead8cffa88bfb704a03ec918b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCo0esywK+sNU5EO8RAtEYAJ4r+9tCMQKO0vkRx+gWolO7p5iXhwCfbKf5
41ghEeWPQrFXPv2GMruR7t0=
=o1eg
-----END PGP SIGNATURE-----
mpm@selenic.com [Sun, 05 Jun 2005 00:42:44 -0800] rev 260
Some tweaking of notes.txt
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Some tweaking of notes.txt
manifest hash:
c32913f139f35f28a87a4e432b5dd63deaab3c2b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCorsEywK+sNU5EO8RAph7AKCT8zmySShpwxUI9lNbe/Ctc0sZiwCgtAKG
TaNy7+0p62smfYecxxvBwS4=
=mLc6
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 04 Jun 2005 23:37:11 -0800] rev 259
fix addremove
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
fix addremove
manifest hash:
15a37c156e2186e89ef086ef974541bf1c695280
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCoqunywK+sNU5EO8RAuICAJ9x7W0xz1ZBJ7nFYiiQEBljyYwqhACfVE7R
oiP0nigB4SzQMMmifrQ7UkA=
=/c5l
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 04 Jun 2005 20:02:27 -0800] rev 258
hgweb: watch changelog for changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hgweb: watch changelog for changes
Check the mtime of the changelog for updates on each invocation of
run(). For the standalone server, this means you don't need to re-run
it to pick up changes.
manifest hash:
398bdbf03b867df27da9e803a094dd265f62e12c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFConlTywK+sNU5EO8RAljMAKCigJKR2aXabt1kuYeiAl+PZEN1owCeKShZ
oZKfo+I7e967FqI9l7NIPFE=
=pTp6
-----END PGP SIGNATURE-----
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-----
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-----
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-----
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-----
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-----
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-----