Rev 2867: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/wt.update_to_one_parent_via_delta
Robert Collins
robertc at robertcollins.net
Wed Oct 3 02:51:04 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/wt.update_to_one_parent_via_delta
------------------------------------------------------------
revno: 2867
revision-id: robertc at robertcollins.net-20071003015047-l3ji2gzmq31f0z0e
parent: robertc at robertcollins.net-20070927090426-u91r9ki6vrpjqcsd
parent: pqm at pqm.ubuntu.com-20071002082143-hkducdw42q0cel4l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: wt.update_to_one_parent_via_delta
timestamp: Wed 2007-10-03 11:50:47 +1000
message:
Merge bzr.dev.
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2865.1.10
revision-id: pqm at pqm.ubuntu.com-20071002082143-hkducdw42q0cel4l
parent: pqm at pqm.ubuntu.com-20071002074820-0o6n138uq5uh7snb
parent: andrew.bennetts at canonical.com-20071002052647-0fbgkhnjyc441e90
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-02 09:21:43 +0100
message:
(Andrew Bennetts) Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2865.1.7.2.1
revision-id: andrew.bennetts at canonical.com-20071002052647-0fbgkhnjyc441e90
parent: pqm at pqm.ubuntu.com-20070928041435-uls0r9txks111272
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: import-nits
timestamp: Tue 2007-10-02 15:26:47 +1000
message:
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2865.1.9
revision-id: pqm at pqm.ubuntu.com-20071002074820-0o6n138uq5uh7snb
parent: pqm at pqm.ubuntu.com-20071002034323-vljek8tt4xkzxkcu
parent: mbp at sourcefrog.net-20071002071411-e12qelg28twzd6rz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-02 08:48:20 +0100
message:
If an internal error happens in a test, don't turn it into a return code plus traceback but rather let it run up and be seen as a test error (mbp)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2830.2.12
revision-id: mbp at sourcefrog.net-20071002071411-e12qelg28twzd6rz
parent: mbp at sourcefrog.net-20071002065652-9pjpwb1vulkjvrvh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-10-02 17:14:11 +1000
message:
Fix vim lossage
modified:
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
------------------------------------------------------------
revno: 2830.2.11
revision-id: mbp at sourcefrog.net-20071002065652-9pjpwb1vulkjvrvh
parent: mbp at sourcefrog.net-20071002061356-t1od1dmnppz33diq
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-10-02 16:56:52 +1000
message:
Integrate testing of return codes/error reporting
modified:
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
------------------------------------------------------------
revno: 2830.2.10
revision-id: mbp at sourcefrog.net-20071002061356-t1od1dmnppz33diq
parent: mbp at sourcefrog.net-20071002060452-4e4w9deuxn3azr0m
parent: mbp at sourcefrog.net-20070918072340-gs8a71bda3e26dsh
parent: pqm at pqm.ubuntu.com-20070928041435-uls0r9txks111272
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-10-02 16:13:56 +1000
message:
merge trunk
added:
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-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/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/HttpServer.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
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/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_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
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_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
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/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
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2830.2.5.1.1
revision-id: mbp at sourcefrog.net-20070918072340-gs8a71bda3e26dsh
parent: mbp at sourcefrog.net-20070918063155-ifdze60wpnslgdbv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-09-18 17:23:40 +1000
message:
Make run_bzr_decode undeprecated again, but put it in the particular test class
TestNonAscii that needs it. Remove run_bzr(output_encoding) parameter.
run_bzr_decode now takes a specific parameter that says if we expect the
operation to fail with a UnicodeError, and we test for that in particular.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
------------------------------------------------------------
revno: 2830.2.9
revision-id: mbp at sourcefrog.net-20071002060452-4e4w9deuxn3azr0m
parent: mbp at sourcefrog.net-20071002060412-x3koee70tqi5fg36
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-10-02 16:04:52 +1000
message:
Add EXIT_OK=0
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2830.2.8
revision-id: mbp at sourcefrog.net-20071002060412-x3koee70tqi5fg36
parent: mbp at sourcefrog.net-20070924064221-nu12try0hbilenlj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-10-02 16:04:12 +1000
message:
Review cleanups of test_non_ascii
modified:
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
------------------------------------------------------------
revno: 2830.2.7
revision-id: mbp at sourcefrog.net-20070924064221-nu12try0hbilenlj
parent: mbp at sourcefrog.net-20070921060245-j6a3g6oxdbs1bdjn
parent: mbp at sourcefrog.net-20070820060505-4ywu68q7scnbfmat
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Mon 2007-09-24 16:42:21 +1000
message:
Return exitcode 4 on internal error
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2713.2.3
revision-id: mbp at sourcefrog.net-20070820060505-4ywu68q7scnbfmat
parent: mbp at sourcefrog.net-20070820041609-gere4zndmrvviwji
parent: pqm at pqm.ubuntu.com-20070820045741-zojy0q9vgi0d860r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: error-exitcode
timestamp: Mon 2007-08-20 16:05:05 +1000
message:
merge trunk
added:
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 2713.2.2
revision-id: mbp at sourcefrog.net-20070820041609-gere4zndmrvviwji
parent: mbp at sourcefrog.net-20070816075121-fr9221nx4clj2eoz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: error-exitcode
timestamp: Mon 2007-08-20 14:16:09 +1000
message:
Add mention of exitcode 4 for internal errors
modified:
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2713.2.1
revision-id: mbp at sourcefrog.net-20070816075121-fr9221nx4clj2eoz
parent: pqm at pqm.ubuntu.com-20070816055011-tnjdmdi948uyvz6a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: error-exitcode
timestamp: Thu 2007-08-16 17:51:21 +1000
message:
Return exitcode 4 if an internal error occurs
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 2830.2.6
revision-id: mbp at sourcefrog.net-20070921060245-j6a3g6oxdbs1bdjn
parent: mbp at sourcefrog.net-20070918063155-ifdze60wpnslgdbv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Fri 2007-09-21 16:02:45 +1000
message:
Make run_bzr_decode undeprecated again, but put it in the particular test class
TestNonAscii that needs it. Remove run_bzr(output_encoding) parameter.
run_bzr_decode now takes a specific parameter that says if we expect the
operation to fail with a UnicodeError, and we test for that in particular.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
------------------------------------------------------------
revno: 2830.2.5
revision-id: mbp at sourcefrog.net-20070918063155-ifdze60wpnslgdbv
parent: mbp at sourcefrog.net-20070918062825-vw07w72sphre1z9l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-09-18 16:31:55 +1000
message:
Deprecated ``run_bzr_decode``; use the new ``output_encoding`` parameter to
``TestCase.run_bzr`` instead.
Removed previously deprecated varargs interface to ``TestCase.run_bzr`` and
deprecated methods ``TestCase.capture`` and ``TestCase.run_bzr_captured``.
(Martin Pool)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
------------------------------------------------------------
revno: 2830.2.4
revision-id: mbp at sourcefrog.net-20070918062825-vw07w72sphre1z9l
parent: mbp at sourcefrog.net-20070918054731-0t0117jhw02neu8h
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-09-18 16:28:25 +1000
message:
Fix previously hidden NameError in reconfigure
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2830.2.3
revision-id: mbp at sourcefrog.net-20070918054731-0t0117jhw02neu8h
parent: mbp at sourcefrog.net-20070918054009-ftyrlbde4dmzi40t
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-09-18 15:47:31 +1000
message:
Fix up test_command_encoding to expect to see the assertion raised on unicode errors
modified:
bzrlib/tests/blackbox/test_command_encoding.py test_command_encoding.py-20060106032110-45431fd2ce9ff21f
------------------------------------------------------------
revno: 2830.2.2
revision-id: mbp at sourcefrog.net-20070918054009-ftyrlbde4dmzi40t
parent: mbp at sourcefrog.net-20070918053531-hwrmyg05y3az3xcx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-09-18 15:40:09 +1000
message:
Update test for report_exception to be cleaner and work with new run_bzr behavior
modified:
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
------------------------------------------------------------
revno: 2830.2.1
revision-id: mbp at sourcefrog.net-20070918053531-hwrmyg05y3az3xcx
parent: pqm at pqm.ubuntu.com-20070918034007-n72x452efuovdelm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-traceback
timestamp: Tue 2007-09-18 15:35:31 +1000
message:
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
------------------------------------------------------------
revno: 2865.1.8
revision-id: pqm at pqm.ubuntu.com-20071002034323-vljek8tt4xkzxkcu
parent: pqm at pqm.ubuntu.com-20070928041435-uls0r9txks111272
parent: mbp at sourcefrog.net-20071002025430-5qkc146iuaqxdsgk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-10-02 04:43:23 +0100
message:
Ignore more built files in bzr tree (mbp)
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
------------------------------------------------------------
revno: 2865.1.7.1.2
revision-id: mbp at sourcefrog.net-20071002025430-5qkc146iuaqxdsgk
parent: mbp at sourcefrog.net-20070928065208-lvvvt05b0tov46h4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Tue 2007-10-02 12:54:30 +1000
message:
Ignore .pyd files in bzr tree (windows C extensions)
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
------------------------------------------------------------
revno: 2865.1.7.1.1
revision-id: mbp at sourcefrog.net-20070928065208-lvvvt05b0tov46h4
parent: pqm at pqm.ubuntu.com-20070928041435-uls0r9txks111272
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Fri 2007-09-28 16:52:08 +1000
message:
Add more ignored files
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
------------------------------------------------------------
revno: 2865.1.7
revision-id: pqm at pqm.ubuntu.com-20070928041435-uls0r9txks111272
parent: pqm at pqm.ubuntu.com-20070927065437-oc8enxoek80hyxod
parent: robertc at robertcollins.net-20070928005033-k2aj7takjzzfo3vn
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-09-28 05:14:35 +0100
message:
(robertc) Add bzrlib.errors.InternalBzrError. (Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2865.1.6.1.1
revision-id: robertc at robertcollins.net-20070928005033-k2aj7takjzzfo3vn
parent: pqm at pqm.ubuntu.com-20070927065437-oc8enxoek80hyxod
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-builder
timestamp: Fri 2007-09-28 10:50:33 +1000
message:
* New class ``bzrlib.errors.InternalBzrError`` which is just a convenient
shorthand for deriving from BzrError and setting internal_error = True.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2865.1.6
revision-id: pqm at pqm.ubuntu.com-20070927065437-oc8enxoek80hyxod
parent: pqm at pqm.ubuntu.com-20070927030442-kr30mx8du7pq8o3m
parent: robertc at robertcollins.net-20070927051534-8qi8csecebcltwhx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-27 07:54:37 +0100
message:
(robertc) Code consolidation for the Knit repository format from the packs branch. (Robert Collins)
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
------------------------------------------------------------
revno: 2857.2.2
revision-id: robertc at robertcollins.net-20070927051534-8qi8csecebcltwhx
parent: robertc at robertcollins.net-20070925042530-t6k5echm7yaz9maf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit-repo
timestamp: Thu 2007-09-27 15:15:34 +1000
message:
Review feedback.
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
------------------------------------------------------------
revno: 2857.2.1
revision-id: robertc at robertcollins.net-20070925042530-t6k5echm7yaz9maf
parent: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit-repo
timestamp: Tue 2007-09-25 14:25:30 +1000
message:
(robertc) Knit repo format tidyups from the packs branch. (Robert Collins)
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
------------------------------------------------------------
revno: 2865.1.5
revision-id: pqm at pqm.ubuntu.com-20070927030442-kr30mx8du7pq8o3m
parent: pqm at pqm.ubuntu.com-20070926044943-flj37wmwhmd0l3f1
parent: robertc at robertcollins.net-20070927021812-13m2l8q0m5qbmykj
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-09-27 04:04:42 +0100
message:
(robertc) Minor tweaks to reconcile from the packs branch. (Robert Collins)
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
------------------------------------------------------------
revno: 2857.1.2
revision-id: robertc at robertcollins.net-20070927021812-13m2l8q0m5qbmykj
parent: robertc at robertcollins.net-20070925035721-wjyn9fjd4vxy5n7f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Thu 2007-09-27 12:18:12 +1000
message:
Review feedback.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
------------------------------------------------------------
revno: 2857.1.1
revision-id: robertc at robertcollins.net-20070925035721-wjyn9fjd4vxy5n7f
parent: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Tue 2007-09-25 13:57:21 +1000
message:
(robertc) Reconcile tweaks from the packs branch. (Robert Collins)
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
------------------------------------------------------------
revno: 2865.1.4
revision-id: pqm at pqm.ubuntu.com-20070926044943-flj37wmwhmd0l3f1
parent: pqm at pqm.ubuntu.com-20070926041021-v62vw12qiba8vi4k
parent: ian.clatworthy at internode.on.net-20070926025305-ndw0bqjg58mzmesa
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-26 05:49:43 +0100
message:
code clean-ups for bzrdir.py (Ian Clatworthy)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 2865.1.2.1.1
revision-id: ian.clatworthy at internode.on.net-20070926025305-ndw0bqjg58mzmesa
parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
parent: ian.clatworthy at internode.on.net-20070926025116-m1qpc390hj9ntbz7
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration2
timestamp: Wed 2007-09-26 12:53:05 +1000
message:
code clean-ups for bzrdir.py (Ian Clatworthy)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 2830.1.4
revision-id: ian.clatworthy at internode.on.net-20070926025116-m1qpc390hj9ntbz7
parent: ian.clatworthy at internode.on.net-20070921075617-ihtsvjnp6ic08rlw
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.code-cleanup
timestamp: Wed 2007-09-26 12:51:16 +1000
message:
review tweaks
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 2830.1.3
revision-id: ian.clatworthy at internode.on.net-20070921075617-ihtsvjnp6ic08rlw
parent: ian.clatworthy at internode.on.net-20070921072937-ase3yh9f1pune4vq
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.code-cleanup
timestamp: Fri 2007-09-21 17:56:17 +1000
message:
test that bzrdir retiring fails as expected once limit reached
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 2830.1.2
revision-id: ian.clatworthy at internode.on.net-20070921072937-ase3yh9f1pune4vq
parent: ian.clatworthy at internode.on.net-20070918071435-cjetogmh16akg4v8
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.code-cleanup
timestamp: Fri 2007-09-21 17:29:37 +1000
message:
Incorporate feedback from poolie's review
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2830.1.1
revision-id: ian.clatworthy at internode.on.net-20070918071435-cjetogmh16akg4v8
parent: pqm at pqm.ubuntu.com-20070918034007-n72x452efuovdelm
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.code-cleanup
timestamp: Tue 2007-09-18 17:14:35 +1000
message:
bzrdir.py code clean-ups
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 2865.1.3
revision-id: pqm at pqm.ubuntu.com-20070926041021-v62vw12qiba8vi4k
parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
parent: mbp at sourcefrog.net-20070926023624-25aievju0yd3m10l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-26 05:10:21 +0100
message:
#144633 Fix "unprintable error" message for BzrCheckError and others (mbp)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 2854.1.3
revision-id: mbp at sourcefrog.net-20070926023624-25aievju0yd3m10l
parent: mbp at sourcefrog.net-20070926023045-npkv70za15v30w1r
parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: exception-keyerrors
timestamp: Wed 2007-09-26 12:36:24 +1000
message:
merge trunk
added:
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
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
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2854.1.2
revision-id: mbp at sourcefrog.net-20070926023045-npkv70za15v30w1r
parent: mbp at sourcefrog.net-20070925062946-1tlmmt604lf9bllm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: exception-keyerrors
timestamp: Wed 2007-09-26 12:30:45 +1000
message:
Review feedback on BzrError.message handling
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 2854.1.1
revision-id: mbp at sourcefrog.net-20070925062946-1tlmmt604lf9bllm
parent: pqm at pqm.ubuntu.com-20070924212812-g325vvenhnfktgbh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: exception-keyerrors
timestamp: Tue 2007-09-25 16:29:46 +1000
message:
Fix "unprintable error" message for BzrCheckError and others
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 2865.1.2
revision-id: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
parent: pqm at pqm.ubuntu.com-20070925212801-8p7l0qlplb0t7h2u
parent: bialix at ukr.net-20070925221308-aqaqq1u2qv6kpl2z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-26 00:32:21 +0100
message:
Fix log against smart server branches that don't support tags. (James
Westby)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2865.1.1.1.1
revision-id: bialix at ukr.net-20070925221308-aqaqq1u2qv6kpl2z
parent: pqm at pqm.ubuntu.com-20070925212801-8p7l0qlplb0t7h2u
parent: jw+debian at jameswestby.net-20070918185500-91alkjx8zolds1v8
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: james.westby
timestamp: Wed 2007-09-26 01:13:08 +0300
message:
merge with bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2831.8.1
revision-id: jw+debian at jameswestby.net-20070918185500-91alkjx8zolds1v8
parent: pqm at pqm.ubuntu.com-20070918045733-es6jch43pxvogvhj
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev
timestamp: Tue 2007-09-18 19:55:00 +0100
message:
Fix log against smart server branches that don't support tags. (#140615)
Add get_reverse_tag_dict to DisabledTags for branches that falsely
claim that they support tags (namely smart server branches). When the
remote branch was an old format without tags this caused log to fail.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
------------------------------------------------------------
revno: 2865.1.1
revision-id: pqm at pqm.ubuntu.com-20070925212801-8p7l0qlplb0t7h2u
parent: pqm at pqm.ubuntu.com-20070925205148-yd27v1odc65uql59
parent: bialix at ukr.net-20070925194100-zw5hcmc85hf3m0uf
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-09-25 22:28:01 +0100
message:
`setup.py install` on systems without C-compiler
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2814.4.6
revision-id: bialix at ukr.net-20070925194100-zw5hcmc85hf3m0uf
parent: bialix at ukr.net-20070915051300-fyhdnjmmv97uec4u
parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: install.wo.compiler
timestamp: Tue 2007-09-25 22:41:00 +0300
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/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
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_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
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/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
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/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_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
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/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
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml4.py xml4.py-20050916091259-db5ab55e7e6ca324
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
------------------------------------------------------------
revno: 2814.4.5
revision-id: bialix at ukr.net-20070915051300-fyhdnjmmv97uec4u
parent: bialix at ukr.net-20070914113928-u2my9p5l1oxdq760
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: install.wo.compiler
timestamp: Sat 2007-09-15 08:13:00 +0300
message:
double quotes for extension name
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2814.4.4
revision-id: bialix at ukr.net-20070914113928-u2my9p5l1oxdq760
parent: bialix at ukr.net-20070913122547-019sbxz14kyyl37l
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: install.wo.compiler
timestamp: Fri 2007-09-14 14:39:28 +0300
message:
changes suggested by Aaron and Martin
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2814.4.3
revision-id: bialix at ukr.net-20070913122547-019sbxz14kyyl37l
parent: bialix at ukr.net-20070913110018-whu5m8wfdu7j3n5e
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: install.wo.compiler
timestamp: Thu 2007-09-13 15:25:47 +0300
message:
fixed incomplete try-except
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2814.4.2
revision-id: bialix at ukr.net-20070913110018-whu5m8wfdu7j3n5e
parent: lalinsky at gmail.com-20070911080621-kru223e15w1fkzaa
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: install.wo.compiler
timestamp: Thu 2007-09-13 14:00:18 +0300
message:
support for win32
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2814.4.1
revision-id: lalinsky at gmail.com-20070911080621-kru223e15w1fkzaa
parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: build_ext_if_possible
timestamp: Tue 2007-09-11 10:06:21 +0200
message:
Don't abort ``python setup.py install`` if building of a C extension is not possible.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
Diff too large for email (1845 lines, the limit is 1000).
More information about the bazaar-commits
mailing list