Rev 2780: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Tue Sep 25 03:39:56 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2780
revision-id: robertc at robertcollins.net-20070925023928-f0jo9l8veo6c4obc
parent: robertc at robertcollins.net-20070925014751-skcw309yznr5czka
parent: pqm at pqm.ubuntu.com-20070925020712-sf3qg1j3wh0l0hz8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Tue 2007-09-25 12:39:28 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.31
revision-id: pqm at pqm.ubuntu.com-20070925020712-sf3qg1j3wh0l0hz8
parent: pqm at pqm.ubuntu.com-20070925010251-tjzcun2wc2l4grec
parent: robertc at robertcollins.net-20070925011559-8m3sbotvugyn0144
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-25 03:07:12 +0100
message:
(robertc) Trivial repr for CombinedGraphIndex. (Martin Pool).
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.30.1.1
revision-id: robertc at robertcollins.net-20070925011559-8m3sbotvugyn0144
parent: pqm at pqm.ubuntu.com-20070925010251-tjzcun2wc2l4grec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: index
timestamp: Tue 2007-09-25 11:15:59 +1000
message:
(robertc) Trivial repr for CombinedGraphIndex. (Martin Pool).
modified:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.30
revision-id: pqm at pqm.ubuntu.com-20070925010251-tjzcun2wc2l4grec
parent: pqm at pqm.ubuntu.com-20070924212812-g325vvenhnfktgbh
parent: robertc at robertcollins.net-20070924201329-jwfqgsqbrnzpd10b
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-25 02:02:51 +0100
message:
(robertc) Transport.put_file now returns the number of bytes written. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.28.1.1
revision-id: robertc at robertcollins.net-20070924201329-jwfqgsqbrnzpd10b
parent: pqm at pqm.ubuntu.com-20070924114153-9j0aboyxyah6sv2c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: transport.put
timestamp: Tue 2007-09-25 06:13:29 +1000
message:
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
put by the method call, to allow avoiding stat-after-write or
housekeeping in callers. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.29
revision-id: pqm at pqm.ubuntu.com-20070924212812-g325vvenhnfktgbh
parent: pqm at pqm.ubuntu.com-20070924114153-9j0aboyxyah6sv2c
parent: robertc at robertcollins.net-20070924193404-oyg9f9fcfvyr5435
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-24 22:28:12 +0100
message:
(robertc) Special case the zero-or-no-heads case for Graph.heads(). (Robert Collins)
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.25.2.1
revision-id: robertc at robertcollins.net-20070924193404-oyg9f9fcfvyr5435
parent: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: graphwalker
timestamp: Tue 2007-09-25 05:34:04 +1000
message:
(robertc) Special case the zero-or-no-heads case for Graph.heads(). (Robert Collins)
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.28
revision-id: pqm at pqm.ubuntu.com-20070924114153-9j0aboyxyah6sv2c
parent: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
parent: v.ladeuil+lp at free.fr-20070924110757-ed00gn8z0x259dmz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-24 12:41:53 +0100
message:
Fix typo
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.27.1.1
revision-id: v.ladeuil+lp at free.fr-20070924110757-ed00gn8z0x259dmz
parent: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
parent: v.ladeuil+lp at free.fr-20070924110505-4apfu3r909hamrtq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2007-09-24 13:07:57 +0200
message:
Fix typo
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.27.2.1
revision-id: v.ladeuil+lp at free.fr-20070924110505-4apfu3r909hamrtq
parent: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: doc
timestamp: Mon 2007-09-24 13:05:05 +0200
message:
Fix typo.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.27
revision-id: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
parent: v.ladeuil+lp at free.fr-20070924094148-jqyqvapf3keqdcfx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-09-24 11:27:45 +0100
message:
Fix #141382 by comparing real paths and various OSX fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.26.1.1
revision-id: v.ladeuil+lp at free.fr-20070924094148-jqyqvapf3keqdcfx
parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
parent: v.ladeuil+lp at free.fr-20070924094001-k8z6tlxnlcimvg5a
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2007-09-24 11:41:48 +0200
message:
Fix #141382 by comparing real paths and various OSX fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.14
revision-id: v.ladeuil+lp at free.fr-20070924094001-k8z6tlxnlcimvg5a
parent: v.ladeuil+lp at free.fr-20070924085356-g7mx4wdj2np35j37
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.clean
timestamp: Mon 2007-09-24 11:40:01 +0200
message:
Fix 141382 by comparing real paths.
* bzrlib/tests/test_sftp_transport.py:
(SFTPTransportTestRelative.test__remote_path): Use
assertIsSameRealPath.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.13
revision-id: v.ladeuil+lp at free.fr-20070924085356-g7mx4wdj2np35j37
parent: v.ladeuil+lp at free.fr-20070924084931-cce6o30w898zxs3z
parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.clean
timestamp: Mon 2007-09-24 10:53:56 +0200
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.12
revision-id: v.ladeuil+lp at free.fr-20070924084931-cce6o30w898zxs3z
parent: v.ladeuil+lp at free.fr-20070924084635-j9jaa8543zsjs7x7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.clean
timestamp: Mon 2007-09-24 10:49:31 +0200
message:
NEWS should be in alphabetical order.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.11
revision-id: v.ladeuil+lp at free.fr-20070924084635-j9jaa8543zsjs7x7
parent: v.ladeuil+lp at free.fr-20070923171824-1nyy7et3vuj96szg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.clean
timestamp: Mon 2007-09-24 10:46:35 +0200
message:
Review feedback.
* bzrlib/tests/test_sftp_transport.py:
(SFTPTransportTestRelative.test__remote_path): Add comment to
knownFailure.
* bzrlib/tests/test_bundle.py:
(BundleTester.test_unicode_bundle): Associate bug 141438 to
knownFailure.
* bzrlib/tests/__init__.py:
(TestCase.assertIsSameRealPath): Show apparent paths in addition
to real paths.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.10
revision-id: v.ladeuil+lp at free.fr-20070923171824-1nyy7et3vuj96szg
parent: v.ladeuil+lp at free.fr-20070920130159-1y6ey6oy9v6vuzql
parent: pqm at pqm.ubuntu.com-20070922170226-ex2ydmlyboaoj87c
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.clean
timestamp: Sun 2007-09-23 19:18:24 +0200
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.9
revision-id: v.ladeuil+lp at free.fr-20070920130159-1y6ey6oy9v6vuzql
parent: v.ladeuil+lp at free.fr-20070920130129-ke3z09tj0dzqy1oq
parent: pqm at pqm.ubuntu.com-20070920125023-upjqmzln7mjtvj1h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Thu 2007-09-20 15:01:59 +0200
message:
Merge bzr.dev
modified:
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.8
revision-id: v.ladeuil+lp at free.fr-20070920130129-ke3z09tj0dzqy1oq
parent: v.ladeuil+lp at free.fr-20070920111637-ks0vnmps8xmpzm3h
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Thu 2007-09-20 15:01:29 +0200
message:
Rewrite expected failure message
modified:
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.7
revision-id: v.ladeuil+lp at free.fr-20070920111637-ks0vnmps8xmpzm3h
parent: v.ladeuil+lp at free.fr-20070918081400-fx11853zky2twa97
parent: pqm at pqm.ubuntu.com-20070920110135-652zsvb2su692bie
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Thu 2007-09-20 13:16:37 +0200
message:
Merge bzr.dev
added:
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.6
revision-id: v.ladeuil+lp at free.fr-20070918081400-fx11853zky2twa97
parent: v.ladeuil+lp at free.fr-20070917210847-hneglal34t75toin
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Tue 2007-09-18 10:14:00 +0200
message:
Redo minor fix.
* bzrlib/tests/blackbox/test_too_much.py:
(OldTests.test_bzr): Use assertIsSameRealPath.
modified:
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.5
revision-id: v.ladeuil+lp at free.fr-20070917210847-hneglal34t75toin
parent: v.ladeuil+lp at free.fr-20070917123431-065warglku51y822
parent: pqm at pqm.ubuntu.com-20070917205427-yt8z43qj0756so3p
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Mon 2007-09-17 23:08:47 +0200
message:
Merge bzr.dev.
added:
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.4
revision-id: v.ladeuil+lp at free.fr-20070917123431-065warglku51y822
parent: v.ladeuil+lp at free.fr-20070915110822-qamlabd07hmima6i
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Mon 2007-09-17 14:34:31 +0200
message:
Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp
-> /private/tmp).
* bzrlib/tests/__init__.py:
(TestCase.assertIsSameRealPath): New method resolving symlinks
before comparing paths.
* bzrlib/tests/test_selftest.py:
(TestTestCaseInTempDir.test_home_is_not_working,
TestTestCaseWithMemoryTransport.test_home_is_non_existant_dir_under_root,
TestTestCaseWithMemoryTransport.test_cwd_is_TEST_ROOT): Use
assertIsSameRealPath.
* bzrlib/tests/test_plugins.py:
(TestPlugins.test_trivial_plugin_get_path): Use assertIsSameRealPath.
* bzrlib/tests/test_sftp_transport.py:
(SFTPTransportTestRelative.test__remote_path): The test should be
totally rewritten for OSX. Marking it as know failure in the
interim.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.3
revision-id: v.ladeuil+lp at free.fr-20070915110822-qamlabd07hmima6i
parent: v.ladeuil+lp at free.fr-20070914135618-72gmt7at7xx4utmp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Sat 2007-09-15 13:08:22 +0200
message:
WorkingTree3 unicode related expected failure.
* bzrlib/tests/test_bundle.py:
(BundleTester.test_unicode_bundle): Catch expected test failure
earlier. This one may need more investigation.
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.2
revision-id: v.ladeuil+lp at free.fr-20070914135618-72gmt7at7xx4utmp
parent: v.ladeuil+lp at free.fr-20070914135401-jonrm5thoh4vqt0e
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Fri 2007-09-14 15:56:18 +0200
message:
Minor fix.
* bzrlib/tests/blackbox/test_too_much.py:
(OldTests.test_bzr): On OSX ,/tmp is really /private/tmp.
modified:
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.6.1.1
revision-id: v.ladeuil+lp at free.fr-20070914135401-jonrm5thoh4vqt0e
parent: pqm at pqm.ubuntu.com-20070914082550-j9aknobh4x00qksk
parent: v.ladeuil+lp at free.fr-20070914111435-i0hy1wvvtjyttxas
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx.pass.test.suite
timestamp: Fri 2007-09-14 15:54:01 +0200
message:
Merge fix for #59150 as we want to test without medusa and without parmiko
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
=== modified file 'NEWS'
--- a/NEWS 2007-09-24 05:54:25 +0000
+++ b/NEWS 2007-09-25 02:39:28 +0000
@@ -59,30 +59,34 @@
BUG FIXES:
- * The basename, not the full path, is now used when checking whether
- the profiling dump file begins with ``callgrind.out`` or not. This
- fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
-
* Commands reporting exceptions can now be profiled and still have their
data correctly dumped to a file. For example, a ``bzr commit`` with
no changes still reports the operation as pointless but doing so no
longer throws away the profiling data if this command is run with
``--lsprof-file callgrind.out.ci`` say. (Ian Clatworthy)
- * HttpServer and FtpServer need to be closed properly or a listening socket
- will remain opened.
- (Vincent Ladeuil, #140055)
-
- * Fix commit ordering in corner case (Aaron Bentley, #94975)
-
* Fallback to ftp when paramiko is not installed and sftp can't be used for
``tests/commands`` so that the test suite is still usable without
paramiko.
(Vincent Ladeuil, #59150)
+ * Fix commit ordering in corner case (Aaron Bentley, #94975)
+
* Fix selftest semi-random noise during http related tests.
(Vincent Ladeuil, #140614)
+ * Fix failing test by comparing real paths to cover the case where the TMPDIR
+ contains a symbolic link.
+ (Vincent Ladeuil, #141382).
+
+ * HttpServer and FtpServer need to be closed properly or a listening socket
+ will remain opened.
+ (Vincent Ladeuil, #140055)
+
+ * The basename, not the full path, is now used when checking whether
+ the profiling dump file begins with ``callgrind.out`` or not. This
+ fixes a bug reported by Aaron Bentley on IRC. (Ian Clatworthy)
+
* Trivial fix for invoking command ``reconfigure`` without arguments.
(Rob Weir, #141629)
@@ -112,6 +116,10 @@
INTERNALS:
+ * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
+ put by the method call, to allow avoiding stat-after-write or
+ housekeeping in callers. (Robert Collins)
+
* New method ``bzrlib.osutils.minimum_path_selection`` useful for removing
duplication from user input, when a user mentions both a path and an item
contained within that path. (Robert Collins)
@@ -376,10 +384,6 @@
useful functionality for determining the path of a plugin, its tests, and
its version information. (Robert Collins)
- * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
- put by the method call, to allow avoiding stat-after write or
- housekeeping in callers. (Robert Collins)
-
* Add the option user_encoding to the function 'show_diff_trees()'
in order to move the user encoding at the UI level. (Goffredo Baroncelli)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2007-09-22 00:40:44 +0000
+++ b/bzrlib/builtins.py 2007-09-24 11:05:05 +0000
@@ -1430,7 +1430,7 @@
help='Pass these options to the external diff program.'),
Option('prefix', type=str,
short_name='p',
- help='Set prefixes to added to old and new filenames, as '
+ help='Set prefixes added to old and new filenames, as '
'two values separated by a colon. (eg "old/:new/").'),
'revision',
'change',
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py 2007-09-03 22:17:20 +0000
+++ b/bzrlib/graph.py 2007-09-24 19:34:04 +0000
@@ -231,6 +231,8 @@
order if they need it.
"""
candidate_heads = set(keys)
+ if len(candidate_heads) < 2:
+ return candidate_heads
searchers = dict((c, self._make_breadth_first_searcher([c]))
for c in candidate_heads)
active_searchers = dict(searchers)
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2007-09-23 20:29:13 +0000
+++ b/bzrlib/tests/__init__.py 2007-09-25 02:39:28 +0000
@@ -982,6 +982,12 @@
self.assertEqual(mode, actual_mode,
'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
+ def assertIsSameRealPath(self, path1, path2):
+ """Fail if path1 and path2 points to different files"""
+ self.assertEqual(osutils.realpath(path1),
+ osutils.realpath(path2),
+ "apparent paths:\na = %s\nb = %s\n," % (path1, path2))
+
def assertIsInstance(self, obj, kls):
"""Fail if obj is not an instance of kls"""
if not isinstance(obj, kls):
=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
--- a/bzrlib/tests/blackbox/test_too_much.py 2007-08-06 08:25:46 +0000
+++ b/bzrlib/tests/blackbox/test_too_much.py 2007-09-18 08:14:00 +0000
@@ -386,8 +386,8 @@
chdir('branch1')
self.run_bzr('init')
- self.assertEquals(self.run_bzr('root')[0].rstrip(),
- pathjoin(self.test_dir, 'branch1'))
+ self.assertIsSameRealPath(self.run_bzr('root')[0].rstrip(),
+ pathjoin(self.test_dir, 'branch1'))
progress("status of new file")
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py 2007-08-17 16:19:09 +0000
+++ b/bzrlib/tests/test_bundle.py 2007-09-24 08:46:35 +0000
@@ -44,7 +44,6 @@
from bzrlib.tests import (TestCaseInTempDir, TestCaseWithTransport,
TestCase, TestSkipped, test_commit)
from bzrlib.transform import TreeTransform
-from bzrlib.workingtree import WorkingTree
class MockTree(object):
@@ -795,6 +794,10 @@
rev_id='i18n-1', committer=u'William Dod\xe9')
if sys.platform == 'darwin':
+ from bzrlib.workingtree import WorkingTree3
+ if type(self.tree1) is WorkingTree3:
+ self.knownFailure("Bug #141438: fails for WorkingTree3 on OSX")
+
# On Mac the '\xe9' gets changed to 'e\u0301'
self.assertEqual([u'.bzr', u'with Dode\u0301'],
sorted(os.listdir(u'b1')))
=== modified file 'bzrlib/tests/test_plugins.py'
--- a/bzrlib/tests/test_plugins.py 2007-09-21 12:30:48 +0000
+++ b/bzrlib/tests/test_plugins.py 2007-09-23 17:18:24 +0000
@@ -241,7 +241,7 @@
plugins = bzrlib.plugin.plugins()
plugin = plugins['plugin']
plugin_path = self.test_dir + '/plugin.py'
- self.assertEqual(plugin_path, normpath(plugin.path()))
+ self.assertIsSameRealPath(plugin_path, normpath(plugin.path()))
def test_no_test_suite_gives_None_for_test_suite(self):
self.setup_plugin()
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2007-09-03 04:35:49 +0000
+++ b/bzrlib/tests/test_selftest.py 2007-09-17 12:34:31 +0000
@@ -564,8 +564,8 @@
def test_home_is_not_working(self):
self.assertNotEqual(self.test_dir, self.test_home_dir)
cwd = osutils.getcwd()
- self.assertEqual(self.test_dir, cwd)
- self.assertEqual(self.test_home_dir, os.environ['HOME'])
+ self.assertIsSameRealPath(self.test_dir, cwd)
+ self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
class TestTestCaseWithMemoryTransport(TestCaseWithMemoryTransport):
@@ -579,14 +579,15 @@
few tests should need to do that), and having a missing dir as home is
an effective way to ensure that this is the case.
"""
- self.assertEqual(self.TEST_ROOT + "/MemoryTransportMissingHomeDir",
+ self.assertIsSameRealPath(
+ self.TEST_ROOT + "/MemoryTransportMissingHomeDir",
self.test_home_dir)
- self.assertEqual(self.test_home_dir, os.environ['HOME'])
+ self.assertIsSameRealPath(self.test_home_dir, os.environ['HOME'])
def test_cwd_is_TEST_ROOT(self):
- self.assertEqual(self.test_dir, self.TEST_ROOT)
+ self.assertIsSameRealPath(self.test_dir, self.TEST_ROOT)
cwd = osutils.getcwd()
- self.assertEqual(self.test_dir, cwd)
+ self.assertIsSameRealPath(self.test_dir, cwd)
def test_make_branch_and_memory_tree(self):
"""In TestCaseWithMemoryTransport we should not make the branch on disk.
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py 2007-09-14 09:38:52 +0000
+++ b/bzrlib/tests/test_sftp_transport.py 2007-09-24 09:40:01 +0000
@@ -108,6 +108,16 @@
"""Test the SFTP transport with homedir based relative paths."""
def test__remote_path(self):
+ if sys.platform == 'darwin':
+ # This test is about sftp absolute path handling. There is already
+ # (in this test) a TODO about windows needing an absolute path
+ # without drive letter. To me, using self.test_dir is a trick to
+ # get an absolute path for comparison purposes. That fails for OSX
+ # because the sftp server doesn't resolve the links (and it doesn't
+ # have to). --vila 20070924
+ self.knownFailure('Mac OSX symlinks /tmp to /private/tmp,'
+ ' testing against self.test_dir'
+ ' is not appropriate')
t = self.get_transport()
# This test require unix-like absolute path
test_dir = self.test_dir
@@ -118,12 +128,14 @@
test_dir = '/' + test_dir
# try what is currently used:
# remote path = self._abspath(relpath)
- self.assertEqual(test_dir + '/relative', t._remote_path('relative'))
+ self.assertIsSameRealPath(test_dir + '/relative',
+ t._remote_path('relative'))
# we dont os.path.join because windows gives us the wrong path
root_segments = test_dir.split('/')
root_parent = '/'.join(root_segments[:-1])
# .. should be honoured
- self.assertEqual(root_parent + '/sibling', t._remote_path('../sibling'))
+ self.assertIsSameRealPath(root_parent + '/sibling',
+ t._remote_path('../sibling'))
# / should be illegal ?
### FIXME decide and then test for all transports. RBC20051208
More information about the bazaar-commits
mailing list