mpm@selenic.com [Sat, 02 Jul 2005 18:25:15 -0800] rev 579
Actually warn on pulling from an unrelated repository
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Actually warn on pulling from an unrelated repository
add some comments to findincoming
track the base nodes of the fetch set
report if the base set only contains nullid
add a test case
manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j
ClLpn0dKZnB46dh0F8zhuuk=
=emNb
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 15:38:16 -0800] rev 578
Remove empty directories on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove empty directories on update
manifest hash: 113969ec14c75eb9e1013b23cf096f722932b84d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyVoywK+sNU5EO8RAklKAKCzSUhuFClkHN85qlnDp5iVscZbtgCeJVwx
dqaqG20GjPMWBg0d1ggI/ro=
=o2Uv
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 15:34:23 -0800] rev 577
Remove -p global switch in preparation for combining namespaces
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove -p global switch in preparation for combining namespaces
manifest hash: 88b5d17097aababa5c2c9242deba51598b207e3c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyR/ywK+sNU5EO8RAvPbAJ0XtMA5E1y71hrx9ahBxU3sys98LwCghnz/
xks9tYPTnG8aizwEmg68EGw=
=5MkD
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 15:21:22 -0800] rev 576
Handle unknown files better on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle unknown files better on update
If we spot an unknown file that's identical to one that's in the
update, we get the updated one so that it shows up in the dirstate
properly.
manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ
VgKqZS54hTAWN3jL2yllUhI=
=iPQD
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 13:40:15 -0800] rev 575
More whitespace cleanups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More whitespace cleanups
manifest hash: 6721a7b11295e0127386b080fd7a7b516ebced74
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwm/ywK+sNU5EO8RAnl+AKCg/7ZCW7zIoG0nefksZzgLzgNmFACgnAFz
ZkW0LyZcU/hkFgXoGwo7ktk=
=AW+0
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 13:39:40 -0800] rev 574
Update test-diffdir output
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Update test-diffdir output
manifest hash: cd0fb3a3708897fe959852c48de1804fb0b74bf4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwmcywK+sNU5EO8RAlRCAJ9SBrMQLSRVY1j3V1YO25dGbIN18QCfTbHJ
6/4+xEBX2j3VxUf1g3ayce8=
=kcDR
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 13:16:42 -0800] rev 573
transaction: nullify journal after close()
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
transaction: nullify journal after close()
This keeps us from trying to cleanup in __del__.
bug spotted by K Thananchayan <thananck@yahoo.com>
manifest hash: 1f4c5fa43d2458cdcb6ec0f0a7066b3c3e699f33
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxwQ6ywK+sNU5EO8RAuGhAJ9+BnKILwRCF9EKlPTz2zptiysQ/QCgsB3s
VKIehiStv+ibWQQi15k4mwk=
=nZD1
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:45:53 -0800] rev 572
[PATCH 5/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 5/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
remove the unused function hgweb.parent()
manifest hash: cd5a8812bc0ecbefb2e9e007f6e2bad12cd9e485
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxv0BywK+sNU5EO8RAtw8AJ4ttjQzg2ZT+17r054Uaidvn34ruwCgtTDt
Gcr7hR1VvMyFC70IWBdXIpE=
=oKEL
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:34:45 -0800] rev 571
[PATCH 3/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 3/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
the filediff template use the old style p1/p2 and p1rev/p2rev
inteface; the patch removes this old stuff, and update the code to the
new style
manifest hash: 29536b6ee71f03a48bceb7336040070ecd0d2b9e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvplywK+sNU5EO8RApW4AKCrTLHofr8jELtvNRpoNJHc0sjEfgCfaY2q
/H96T6BMMXA4VLFVxzOBHCo=
=u4El
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:31:32 -0800] rev 570
[PATCH 2/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 2/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
hgweb: rename #parent1# and #parent2# to #parent# in the template managment
manifest hash: c7da29f029a1c875127989bb6635007a90f8f59c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvmkywK+sNU5EO8RAnREAKCXuVAU054xkYsfQLug3y/u4tpGxQCfdnKA
QkX42FSUBN1EwFyzrzC6vs0=
=o8VK
-----END PGP SIGNATURE-----
mpm@selenic.com [Sat, 02 Jul 2005 12:27:27 -0800] rev 569
[PATCH 1/5]: cleaning the template parent management in hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH 1/5]: cleaning the template parent management in hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
the template pages contain two entry named #parent1# and #parent2#;
this is no +good because with the template system implemented in hgweb
both the functions can be replaced with only one entry named
"#parent#". The code in hgweb will replace this tag with the
appropriate number of parents (+one, two... or more if and when will
be used ).
The first two patch perform this change in two step:
1) change the code to manage only one entry ( #parent1# )
2) remove any reference to #parent2#, and change both the code and the
templates to rename #parent1# in #parent2#
the last three patchs are clean-up.
The patch are five
- - patch #1:
- - clean the code in order to ignore #parent2# and use only #parent1#
hgweb: chanage the parent1/parent2 code managment
manifest hash: 6ba707904edf176c7269f2d9b80502902e6934c6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxvivywK+sNU5EO8RAkotAJ4vbR0KE+Jem20rQbaJxy8NRFeyJgCdHy2M
hxmeD9erv17BrSKLGd5QAQI=
=Or/F
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:46:31 -0800] rev 568
[PATCH] Add tags to hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Add tags to hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 3a59c363799c974b042dbb55f943d830feb1b34f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxcfHywK+sNU5EO8RAgEKAJ40SRMOyBOkbS8QU2MIBUzBnhu5AwCbBDjR
M+gaWyqzqOBzO1r+9zpb37k=
=l1pL
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:43:36 -0800] rev 567
Add parent revision numbers back to hgweb
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add parent revision numbers back to hgweb
From: Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 9f81492df935e94e7c544b071aa9caac3b102190
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxccYywK+sNU5EO8RAkW7AJ9aXTUZ9JnbZMrxCrcuXozYzkdw/gCfT8IO
qnqe966Mvapr2jULeXldQW4=
=XiV5
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:34:31 -0800] rev 566
repo.changes: fix duplicate changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
repo.changes: fix duplicate changes
We need to discard the changed and added lists from dirstate.changes
before adding to them when comparing manifests. Otherwise something
that changed from rev->parent->working dir will appear twice.
Bug spotted by Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV
D4ay6Qw9sIodEPjRebvk3GE=
=AZd2
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:18:02 -0800] rev 565
[PATCH] Make ui.warn write to stderr
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Make ui.warn write to stderr
From: Bryan O'Sullivan <bos@serpentine.com>
> Someone is probably using ui.write instead of ui.warn.
Actually, ui.warn uses ui.write. So hg never prints to stderr right
now. Here's a patch to fix that.
[mpm: add sys.stdout.flush()]
manifest hash: c09c645a5985b640a7ad884afb0eeb11fcffbb19
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxcEaywK+sNU5EO8RAhWUAJ9vVteAodKC9zIhIWUuPqVl2d915QCePp5S
asuv62w4Zv+o0gB3SoucYdQ=
=NYrs
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:07:40 -0800] rev 564
[PATCH] Add contrib/buildrpm script
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] Add contrib/buildrpm script
From: Bryan O'Sullivan <bos@serpentine.com>
Just run "buildrpm", and it builds an RPM for you. No funky monkey
business required.
manifest hash: b8fde5108b5cc8f49ce248d14ac2ee7ad004c91c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxb6sywK+sNU5EO8RApQZAJ94VD6NQr9l4Xx6w3S8EdpCIUuiIACfdoHA
qnQWtMM+kqAzi3LnO92UYWE=
=SWIO
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 14:03:42 -0800] rev 563
[PATCH] clean up RPM spec file
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] clean up RPM spec file
From: Bryan O'Sullivan <bos@serpentine.com>
The current RPM spec file makes it impossible to split Mercurial into
multiple interdependent packages. Here's a patch that fixes that
problem.
manifest hash: 4acc4c5cf4485d92a32d2259b83314b7167dece3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxb2+ywK+sNU5EO8RAnrTAJ4tkAh6xnHvRHMxzrfqKb/SXYS2wwCeMfK1
PAr+1FFoSqUmA9rt8Yaw6f4=
=MaPn
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 11:49:58 -0800] rev 562
hg clone: only use the absolute path for .hg/hgrc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
hg clone: only use the absolute path for .hg/hgrc
manifest hash: 7fb6a265249a3c910c0321eb1efc61c38429ac91
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxZ5mywK+sNU5EO8RApIwAJwKdex+GwoflS8vKY9h7qA1F4/Z8wCgjkWH
VsKsuPsM97sluArdDZLZsbs=
=0g6X
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 11:24:09 -0800] rev 561
Fix dodiff/changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix dodiff/changes
dodiff was failing to pass both nodes to changes
changes was comparing things backwards, resulting in added/deleted confusion
in dodiff
changes was deleting things from cached manifests, use copy()
changes now sorts output lists
manifest hash: 6ad972b0895b9d855e246efef49c2ebd943946b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxZhZywK+sNU5EO8RApZWAJ9mYv1zc7IjXPIMwbVsfroQs8jfBACgn7R7
rTqLTTyIkM1OpL/ebnMtCOY=
=VcIr
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 11:21:04 -0800] rev 560
fancyopts: drop unneeded import
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
fancyopts: drop unneeded import
manifest hash: 09729db8a301510f021fd84a9e82a16ea3ccc67b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxZegywK+sNU5EO8RAnJwAKCn8kw2VzLc1NgObPFyYI1NxtBJSACgk1v4
d041JB9E0PybyftBFV55Of0=
=Cp7N
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 09:04:50 -0800] rev 559
[PATCH] hg clone stored path fix
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[PATCH] hg clone stored path fix
there is a small problem with hg version f6c6fa15ff70+20050701. when i
clone a repository (on my local system), the path of "parent" repo
stored in the clone repo is not correct.
here is more details -- i clone a repo named "xen-today" with:
hg clone xen-today/ test4
then file "test4/.hg/hgrc" contains:
[paths]
default = /home/aq/projects/hg-xen/xen-today
Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>
manifest hash: 6ec2f059907fd5544e40c9e78284271d52eeb23f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxXeyywK+sNU5EO8RAru1AKCVeqGqLrbLn8Zonr683jNlVx+FoACdHoll
B2+uEV33zpxWUj7fcntYJVk=
=SB49
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 09:01:07 -0800] rev 558
transaction: __del__ should do nothing if the journal already exists
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
transaction: __del__ should do nothing if the journal already exists
manifest hash: c85f747ca762b7c446d306cbd7a20f8e566557fb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxXbTywK+sNU5EO8RAvjsAKCcTSzN9OjtoAdaZgtjDs9380ia7ACfcXsx
FcNESqr4nX9b97WTGszJs48=
=C2sL
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 08:54:52 -0800] rev 557
recover: the journal is named 'journal'
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
recover: the journal is named 'journal'
spotted by K Thananchayan <thananck@yahoo.com>
manifest hash: a2ecfedb3d58011cdf5ef7741ff61aba15aa5885
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxXVbywK+sNU5EO8RAmiBAKCgULQVAZ42xuPRyzb3Rrk794LtaACgoLdF
TNtgK/MqF6+EjWNJ5mm2geE=
=m5U3
-----END PGP SIGNATURE-----
mpm@selenic.com [Fri, 01 Jul 2005 00:34:50 -0800] rev 556
Move dirstate.uniq to util.unique
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Move dirstate.uniq to util.unique
manifest hash: 8ac613c30a4471f14ae52f14ed0839d66eeaebb7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxQAqywK+sNU5EO8RAsTiAJ9E9/cALe+W8ojtfVdiXXre5dB/9gCeOgxr
mRnVw/WDplkATW5450Pgsug=
=xSfl
-----END PGP SIGNATURE-----