Rev 3214: merge bzr.dev in file:///v/home/vila/src/bzr/experimental/selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Thu Feb 14 17:25:53 GMT 2008
At file:///v/home/vila/src/bzr/experimental/selftest/
------------------------------------------------------------
revno: 3214
revision-id:v.ladeuil+lp at free.fr-20080214172545-26fcbg17zmjq62bf
parent: v.ladeuil+lp at free.fr-20080214160905-7naswoutvt6qk5uh
parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest
timestamp: Thu 2008-02-14 18:25:45 +0100
message:
merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3193.1.31
revision-id:pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
parent: pqm at pqm.ubuntu.com-20080213045747-hqu3aghke3zn12b7
parent: robertc at robertcollins.net-20080213033001-rw70ul0zb02ph856
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-13 06:27:01 +0000
message:
(robertc) Various PEP-8 cleanups of progress.py. (Robert Collins)
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
------------------------------------------------------------
revno: 3006.3.5
revision-id:robertc at robertcollins.net-20080213033001-rw70ul0zb02ph856
parent: robertc at robertcollins.net-20071121001635-xu5ddwu2f8tykf8p
parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2008-02-13 14:30:01 +1100
message:
Merge to fix conflicts.
removed:
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
doc/en/user-reference/index.txt index.txt-20070830033353-ud9e03xsh24053oo-1
added:
bzrlib/help_topics/ help_topics-20071211013603-qz0sojhgxhiujm6a-1
bzrlib/help_topics/en/ bzrlibhelp-20071209214431-xzg3moksichjwyts-1
bzrlib/switch.py switch.py-20071116011000-v5lnw7d2wkng9eux-1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/repository_implementations/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/quick-reference/quick-start-summary.pdf quickstartsummary.pd-20071207005239-it6xmdjml8nxvzgt-1
doc/en/quick-reference/quick-start-summary.png quickstartsummary.pn-20071203142852-hsiybkmh37q5owwe-1
doc/en/tutorials/ docentutorials-20071127235845-bm2lu60bvau1ptmh-1
doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/best_practice_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/central_intro.txt central_intro.txt-20071123055134-k5x4ekduci2lbn36-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
doc/en/user-guide/entering_commands.txt using_bazaar.txt-20071114035000-q36a9h57ps06uvnl-6
doc/en/user-guide/getting_help.txt getting_help.txt-20071128000722-ncxiua259xwbdbg7-2
doc/en/user-guide/images/ images-20071114035000-q36a9h57ps06uvnl-3
doc/en/user-guide/images/workflows_centralized.png workflows_centralize-20071114035000-q36a9h57ps06uvnl-8
doc/en/user-guide/images/workflows_centralized.svg workflows_centralize-20071130043324-bhms0cgyphhq1b2x-1
doc/en/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20071114035000-q36a9h57ps06uvnl-9
doc/en/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20071130043324-bhms0cgyphhq1b2x-2
doc/en/user-guide/images/workflows_localcommit.png workflows_localcommi-20071114035000-q36a9h57ps06uvnl-10
doc/en/user-guide/images/workflows_localcommit.svg workflows_localcommi-20071130043324-bhms0cgyphhq1b2x-3
doc/en/user-guide/images/workflows_peer.png workflows_peer.png-20071114035000-q36a9h57ps06uvnl-11
doc/en/user-guide/images/workflows_peer.svg workflows_peer.svg-20071130043324-bhms0cgyphhq1b2x-4
doc/en/user-guide/images/workflows_pqm.png workflows_pqm.png-20071114035000-q36a9h57ps06uvnl-12
doc/en/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20071130043324-bhms0cgyphhq1b2x-5
doc/en/user-guide/images/workflows_shared.png workflows_shared.png-20071114035000-q36a9h57ps06uvnl-13
doc/en/user-guide/images/workflows_shared.svg workflows_shared.svg-20071130043324-bhms0cgyphhq1b2x-6
doc/en/user-guide/images/workflows_single.png workflows_single.png-20071114035000-q36a9h57ps06uvnl-14
doc/en/user-guide/images/workflows_single.svg workflows_single.svg-20071130043324-bhms0cgyphhq1b2x-7
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/merging_changes.txt merging_changes.txt-20071122141511-0knao2lklsdsvb1q-3
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
doc/en/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20071123055134-k5x4ekduci2lbn36-3
doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
doc/en/user-guide/revnos.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/solo_intro.txt solo_workflow.txt-20071121073725-0corxykv5irjal00-7
doc/en/user-guide/starting_a_project.txt starting_a_project.t-20071121073725-0corxykv5irjal00-8
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/en/user-guide/using_checkouts.txt using_checkouts.txt-20071123055134-k5x4ekduci2lbn36-4
doc/en/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20071123154453-dk2mjhrg1vpjm5w2-5
doc/en/user-guide/working_offline_central.txt working_offline_cent-20071123055134-k5x4ekduci2lbn36-5
doc/en/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20071114035000-q36a9h57ps06uvnl-7
doc/en/user-reference/readme.txt readme.txt-20071211133352-guencaey6fpesv4j-1
index.txt index.txt-20071121073725-0corxykv5irjal00-1
renamed:
bzrlib/help_topics.py => bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
doc/en/user-guide/authentication_conf.txt => bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
doc/en/user-guide/centralized_workflow.txt => doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/en/user-guide/configuration.txt => bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/en/user-guide/conflicts.txt => bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/user-guide/tutorial.txt => doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
doc/en/user-reference/hooks.txt => bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-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/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
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_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
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_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_extract.py test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
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/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/quick-reference/quick-start-summary.svg quickstartsummary.sv-20070813143223-5i7bgw7w8s7l3ae2-3
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
doc/en/user-guide/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
doc/en/user-guide/using_aliases.txt using_aliases.txt-20060314161707-c21d27fa2939e039
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
doc/en/tutorials/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
------------------------------------------------------------
revno: 3006.3.4
revision-id:robertc at robertcollins.net-20071121001635-xu5ddwu2f8tykf8p
parent: robertc at robertcollins.net-20071119195948-n46szsvkgl0c9lj4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trivialities
timestamp: Wed 2007-11-21 11:16:35 +1100
message:
Remove obsolete demo and run tests from bzrlib.progress.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
------------------------------------------------------------
revno: 3006.3.3
revision-id:robertc at robertcollins.net-20071119195948-n46szsvkgl0c9lj4
parent: robertc at robertcollins.net-20071119191346-42ifg0e154gwbain
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trivialities
timestamp: Tue 2007-11-20 06:59:48 +1100
message:
Docstring improvement and remove TODO's from progres.py.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
------------------------------------------------------------
revno: 3006.3.2
revision-id:robertc at robertcollins.net-20071119191346-42ifg0e154gwbain
parent: robertc at robertcollins.net-20071119004403-9x0c09udkopvy3ww
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trivialities
timestamp: Tue 2007-11-20 06:13:46 +1100
message:
More formatting corrections.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
------------------------------------------------------------
revno: 3006.3.1
revision-id:robertc at robertcollins.net-20071119004403-9x0c09udkopvy3ww
parent: pqm at pqm.ubuntu.com-20071117180742-59zhz30s7839y41j
committer: Robert Collins <robertc at robertcollins.net>
branch nick: nested-pb
timestamp: Mon 2007-11-19 11:44:03 +1100
message:
Minor PEP8 changes.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
------------------------------------------------------------
revno: 3193.1.30
revision-id:pqm at pqm.ubuntu.com-20080213045747-hqu3aghke3zn12b7
parent: pqm at pqm.ubuntu.com-20080213031902-4xhmwps49vclfhh6
parent: mbp at sourcefrog.net-20080213032553-3b7vz132w0mje0gd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-13 04:57:47 +0000
message:
Open 1.3 development
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3193.28.1
revision-id:mbp at sourcefrog.net-20080213032553-3b7vz132w0mje0gd
parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Wed 2008-02-13 14:25:53 +1100
message:
Open 1.3 development
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3193.1.29
revision-id:pqm at pqm.ubuntu.com-20080213031902-4xhmwps49vclfhh6
parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
parent: mbp at sourcefrog.net-20080213014247-buajf9y91w5xuaa8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-02-13 03:19:02 +0000
message:
Tweaked fix for #187169: if an illegal update is made to the dirstate, don't allow it to be written out.
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3193.27.8
revision-id:mbp at sourcefrog.net-20080213014247-buajf9y91w5xuaa8
parent: mbp at sourcefrog.net-20080213013527-ml201846kikzon42
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Wed 2008-02-13 12:42:47 +1100
message:
Update error format in test_inconsistent_delta
modified:
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
------------------------------------------------------------
revno: 3193.27.7
revision-id:mbp at sourcefrog.net-20080213013527-ml201846kikzon42
parent: mbp at sourcefrog.net-20080213013133-x41bshcx7i5ozpo1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Wed 2008-02-13 12:35:27 +1100
message:
Update and rename test for Dirstate._changes_aborted
modified:
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
------------------------------------------------------------
revno: 3193.27.6
revision-id:mbp at sourcefrog.net-20080213013133-x41bshcx7i5ozpo1
parent: mbp at sourcefrog.net-20080212021404-j0okfr3zla2sv351
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Wed 2008-02-13 12:31:33 +1100
message:
Better error message from bundle-info
modified:
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
------------------------------------------------------------
revno: 3193.27.5
revision-id:mbp at sourcefrog.net-20080212021404-j0okfr3zla2sv351
parent: mbp at sourcefrog.net-20080212021343-3r7l8xi9lsrt4gzu
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Tue 2008-02-12 13:14:04 +1100
message:
Fix incorrect indent in dirstate error handling
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 3193.27.4
revision-id:mbp at sourcefrog.net-20080212021343-3r7l8xi9lsrt4gzu
parent: mbp at sourcefrog.net-20080211112411-j07kfvsserr68aha
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Tue 2008-02-12 13:13:43 +1100
message:
Fix format string for InconsistentDelta
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 3193.27.3
revision-id:mbp at sourcefrog.net-20080211112411-j07kfvsserr68aha
parent: mbp at sourcefrog.net-20080211111556-qs2fntphg1ytv6ne
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Mon 2008-02-11 22:24:11 +1100
message:
Review cleanups for CorruptDirstate: use the path everywhere rather than the object, and use more standard phrasing.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3193.27.2
revision-id:mbp at sourcefrog.net-20080211111556-qs2fntphg1ytv6ne
parent: mbp at sourcefrog.net-20080211110224-u78ya6vu5wmmswju
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Mon 2008-02-11 22:15:56 +1100
message:
Mark problems in a Dirstate that should prevent saving with a _changes_aborted flag rather than _consistency
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
------------------------------------------------------------
revno: 3193.27.1
revision-id:mbp at sourcefrog.net-20080211110224-u78ya6vu5wmmswju
parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
parent: john at arbash-meinel.com-20080204211249-cb49xtg70j5okbw7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.2rc1
timestamp: Mon 2008-02-11 22:02:24 +1100
message:
Merge John's invalid-dirstate rollback patch
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3193.26.2
revision-id:john at arbash-meinel.com-20080204211249-cb49xtg70j5okbw7
parent: jameinel at samus-20080130201600-rhtzr6r55k604rbb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_187169
timestamp: Mon 2008-02-04 15:12:49 -0600
message:
Fix bug #187169, when an invalid delta is supplied to update_basis_by_delta
modified:
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
------------------------------------------------------------
revno: 3193.26.1
revision-id:jameinel at samus-20080130201600-rhtzr6r55k604rbb
parent: pqm at pqm.ubuntu.com-20080130100306-p0uqnxt3hodnyiej
committer: jameinel <jameinel at SAMUS>
branch nick: dirstate_187169
timestamp: Wed 2008-01-30 14:16:00 -0600
message:
Add a test that _iter_changes raises a clearer error when we encounter an invalid rename.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-02-07 06:59:48 +0000
+++ b/NEWS 2008-02-13 03:25:53 +0000
@@ -9,6 +9,26 @@
NOTES WHEN UPGRADING:
+ CHANGES:
+
+ FEATURES:
+
+ IMPROVEMENTS:
+
+ BUGFIXES:
+
+ API BREAKS:
+
+ TESTING:
+
+ INTERNALS:
+
+
+bzr 1.2rc1 (not released yet)
+-----------------------------
+
+ NOTES WHEN UPGRADING:
+
* Fetching via the smart protocol may need to reconnect once during a fetch
if the remote server is running Bazaar 1.1 or earlier, because the client
attempts to use more efficient requests that confuse older servers. You
=== modified file 'bzr'
--- a/bzr 2008-01-15 11:13:19 +0000
+++ b/bzr 2008-02-13 03:25:53 +0000
@@ -1,6 +1,6 @@
#! /usr/bin/env python
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
import sys
# update this on each release
-_script_version = (1, 2, 0)
+_script_version = (1, 3, 0)
if __doc__ is None:
print "bzr does not support python -OO."
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2008-01-22 05:04:50 +0000
+++ b/bzrlib/__init__.py 2008-02-13 03:25:53 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 2, 0, 'dev', 0)
+version_info = (1, 3, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 0.18.
api_minimum_version = (0, 18, 0)
=== modified file 'bzrlib/bundle/commands.py'
--- a/bzrlib/bundle/commands.py 2007-10-16 16:02:01 +0000
+++ b/bzrlib/bundle/commands.py 2008-02-13 01:31:33 +0000
@@ -59,8 +59,8 @@
bundle_info = read_bundle(bundle_file)
else:
if verbose:
- raise errors.BzrCommandError('Verbose requires a merge'
- ' directive')
+ raise errors.BzrCommandError('--verbose requires a merge'
+ ' directive')
reader_method = getattr(bundle_info, 'get_bundle_reader', None)
if reader_method is None:
raise errors.BzrCommandError('Bundle format not supported')
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2007-12-19 08:12:34 +0000
+++ b/bzrlib/dirstate.py 2008-02-12 02:14:04 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -321,6 +321,9 @@
# modified states.
self._header_state = DirState.NOT_IN_MEMORY
self._dirblock_state = DirState.NOT_IN_MEMORY
+ # If true, an error has been detected while updating the dirstate, and
+ # for safety we're not going to commit to disk.
+ self._changes_aborted = False
self._dirblocks = []
self._ghosts = []
self._parents = []
@@ -1292,13 +1295,15 @@
assert old_path is None
# the entry for this file_id must be in tree 0.
entry = self._get_entry(0, file_id, new_path)
- if entry[0][2] != file_id:
- raise errors.BzrError('dirstate: cannot apply delta, working'
- ' tree does not contain new entry %r %r' %
- (new_path, file_id))
+ if entry[0] is None or entry[0][2] != file_id:
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(new_path, file_id,
+ 'working tree does not contain new entry')
if real_add and entry[1][1][0] not in absent:
- raise errors.BzrError('dirstate: inconsistent delta, with '
- 'tree 0. %r %r' % (new_path, file_id))
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(new_path, file_id,
+ 'The entry was considered to be a genuinely new record,'
+ ' but there was already an old record for it.')
# We don't need to update the target of an 'r' because the handling
# of renames turns all 'r' situations into a delete at the original
# location.
@@ -1315,14 +1320,15 @@
assert old_path == new_path
# the entry for this file_id must be in tree 0.
entry = self._get_entry(0, file_id, new_path)
- if entry[0][2] != file_id:
- raise errors.BzrError('dirstate: cannot apply delta, working'
- ' tree does not contain new entry %r %r' %
- (new_path, file_id))
+ if entry[0] is None or entry[0][2] != file_id:
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(new_path, file_id,
+ 'working tree does not contain new entry')
if (entry[1][0][0] in absent or
entry[1][1][0] in absent):
- raise errors.BzrError('dirstate: inconsistent delta, with '
- 'tree 0. %r %r' % (new_path, file_id))
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(new_path, file_id,
+ 'changed considered absent')
entry[1][1] = new_details
def _update_basis_apply_deletes(self, deletes):
@@ -1348,22 +1354,31 @@
block_index, entry_index, dir_present, file_present = \
self._get_block_entry_index(dirname, basename, 1)
if not file_present:
- raise errors.BzrError('dirstate: cannot apply delta, basis'
- ' tree does not contain new entry %r %r' %
- (old_path, file_id))
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(old_path, file_id,
+ 'basis tree does not contain removed entry')
entry = self._dirblocks[block_index][1][entry_index]
if entry[0][2] != file_id:
- raise errors.BzrError('mismatched file_id in tree 1 %r %r' %
- (old_path, file_id))
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(old_path, file_id,
+ 'mismatched file_id in tree 1')
if real_delete:
if entry[1][0][0] != 'a':
- raise errors.BzrError('dirstate: inconsistent delta, with '
- 'tree 0. %r %r' % (old_path, file_id))
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(old_path, file_id,
+ 'This was marked as a real delete, but the WT state'
+ ' claims that it still exists and is versioned.')
del self._dirblocks[block_index][1][entry_index]
else:
if entry[1][0][0] == 'a':
- raise errors.BzrError('dirstate: inconsistent delta, with '
- 'tree 0. %r %r' % (old_path, file_id))
+ self._changes_aborted = True
+ raise errors.InconsistentDelta(old_path, file_id,
+ 'The entry was considered a rename, but the source path'
+ ' is marked as absent.')
+ # For whatever reason, we were asked to rename an entry
+ # that was originally marked as deleted. This could be
+ # because we are renaming the parent directory, and the WT
+ # current state has the file marked as deleted.
elif entry[1][0][0] == 'r':
# implement the rename
del self._dirblocks[block_index][1][entry_index]
@@ -1666,6 +1681,7 @@
assert entry[0][2] and entry[1][tree_index][0] not in ('a', 'r'), 'unversioned entry?!?!'
if fileid_utf8:
if entry[0][2] != fileid_utf8:
+ self._changes_aborted = True
raise errors.BzrError('integrity error ? : mismatching'
' tree_index, file_id and path')
return entry
@@ -1954,6 +1970,12 @@
start over, to allow for fine grained read lock duration, so 'status'
wont block 'commit' - for example.
"""
+ if self._changes_aborted:
+ # Should this be a warning? For now, I'm expecting that places that
+ # mark it inconsistent will warn, making a warning here redundant.
+ trace.mutter('Not saving DirState because '
+ '_changes_aborted is set.')
+ return
if (self._header_state == DirState.IN_MEMORY_MODIFIED or
self._dirblock_state == DirState.IN_MEMORY_MODIFIED):
@@ -2598,6 +2620,7 @@
"""Forget all state information about the dirstate."""
self._header_state = DirState.NOT_IN_MEMORY
self._dirblock_state = DirState.NOT_IN_MEMORY
+ self._changes_aborted = False
self._parents = []
self._ghosts = []
self._dirblocks = []
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py 2008-02-06 16:38:04 +0000
+++ b/bzrlib/errors.py 2008-02-12 02:13:43 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2006, 2007 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -1981,6 +1981,17 @@
_fmt = "Format error in conflict listings"
+class CorruptDirstate(BzrError):
+
+ _fmt = ("Inconsistency in dirstate file %(dirstate_path)s.\n"
+ "Error: %(description)s")
+
+ def __init__(self, dirstate_path, description):
+ BzrError.__init__(self)
+ self.dirstate_path = dirstate_path
+ self.description = description
+
+
class CorruptRepository(BzrError):
_fmt = ("An error has been detected in the repository %(repo_path)s.\n"
@@ -1991,6 +2002,19 @@
self.repo_path = repo.bzrdir.root_transport.base
+class InconsistentDelta(BzrError):
+ """Used when we get a delta that is not valid."""
+
+ _fmt = ("An inconsistent delta was supplied involving %(path)r,"
+ " %(file_id)r\nreason: %(reason)s")
+
+ def __init__(self, path, file_id, reason):
+ BzrError.__init__(self)
+ self.path = path
+ self.file_id = file_id
+ self.reason = reason
+
+
class UpgradeRequired(BzrError):
_fmt = "To use this feature you must upgrade your branch at %(path)s."
=== modified file 'bzrlib/progress.py'
--- a/bzrlib/progress.py 2007-12-30 18:20:15 +0000
+++ b/bzrlib/progress.py 2008-02-13 03:30:01 +0000
@@ -16,22 +16,18 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-"""Simple text-mode progress indicator.
-
-To display an indicator, create a ProgressBar object. Call it,
-passing Progress objects indicating the current state. When done,
-call clear().
-
-Progress is suppressed when output is not sent to a terminal, so as
-not to clutter log files.
+"""Progress indicators.
+
+The usual way to use this is via bzrlib.ui.ui_factory.nested_progress_bar which
+will maintain a ProgressBarStack for you.
+
+For direct use, the factory ProgressBar will return an auto-detected progress
+bar that should match your terminal type. You can manually create a
+ProgressBarStack too if you need multiple levels of cooperating progress bars.
+Note that bzrlib's internal functions use the ui module, so if you are using
+bzrlib it really is best to use bzrlib.ui.ui_factory.
"""
-# TODO: should be a global option e.g. --silent that disables progress
-# indicators, preferably without needing to adjust all code that
-# potentially calls them.
-
-# TODO: If not on a tty perhaps just print '......' for the benefit of IDEs, etc
-
# TODO: Optionally show elapsed time instead/as well as ETA; nicer
# when the rate is unpredictable
@@ -298,7 +294,6 @@
self.child_fraction = 0
self._have_output = False
-
def throttle(self, old_msg):
"""Return True if the bar was updated too recently"""
# time.time consistently takes 40/4000 ms = 0.01 ms.
@@ -320,7 +315,7 @@
return False
def tick(self):
- self.update(self.last_msg, self.last_cnt, self.last_total,
+ self.update(self.last_msg, self.last_cnt, self.last_total,
self.child_fraction)
def child_update(self, message, current, total):
@@ -336,7 +331,7 @@
self.last_msg = ''
self.tick()
- def update(self, msg, current_cnt=None, total_cnt=None,
+ def update(self, msg, current_cnt=None, total_cnt=None,
child_fraction=0):
"""Update and redraw progress bar."""
if msg is None:
@@ -438,7 +433,7 @@
self._have_output = True
#self.to_file.flush()
- def clear(self):
+ def clear(self):
if self._have_output:
self.to_file.write('\r%s\r' % (' ' * (self.width - 1)))
self._have_output = False
@@ -568,40 +563,3 @@
self.cur_phase += 1
assert self.cur_phase < self.total
self.pb.update(self.message, self.cur_phase, self.total)
-
-
-def run_tests():
- import doctest
- result = doctest.testmod()
- if result[1] > 0:
- if result[0] == 0:
- print "All tests passed"
- else:
- print "No tests to run"
-
-
-def demo():
- sleep = time.sleep
-
- print 'dumb-terminal test:'
- pb = DotsProgressBar()
- for i in range(100):
- pb.update('Leoparden', i, 99)
- sleep(0.1)
- sleep(1.5)
- pb.clear()
- sleep(1.5)
-
- print 'smart-terminal test:'
- pb = ProgressBar(show_pct=True, show_bar=True, show_spinner=False)
- for i in range(100):
- pb.update('Elephanten', i, 99)
- sleep(0.1)
- sleep(2)
- pb.clear()
- sleep(1)
-
- print 'done!'
-
-if __name__ == "__main__":
- demo()
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2008-02-06 00:41:04 +0000
+++ b/bzrlib/symbol_versioning.py 2008-02-13 03:25:53 +0000
@@ -44,6 +44,7 @@
'one_zero',
'one_one',
'one_two',
+ 'one_three',
]
from warnings import warn
@@ -69,6 +70,7 @@
zero_ninetythree = one_zero # Maintained for backwards compatibility
one_one = "%s was deprecated in version 1.1."
one_two = "%s was deprecated in version 1.2."
+one_three = "%s was deprecated in version 1.3."
def set_warning_method(method):
"""Set the warning method to be used by this module.
=== modified file 'bzrlib/tests/blackbox/test_bundle_info.py'
--- a/bzrlib/tests/blackbox/test_bundle_info.py 2007-08-16 18:23:13 +0000
+++ b/bzrlib/tests/blackbox/test_bundle_info.py 2008-02-13 01:31:33 +0000
@@ -38,7 +38,7 @@
self.assertContainsRe(info, 'file: 1 .0 multiparent.')
self.assertContainsRe(info, 'nicks: source')
self.assertNotContainsRe(info, 'foo')
- self.run_bzr_error(['Verbose requires a merge directive'],
+ self.run_bzr_error(['--verbose requires a merge directive'],
'bundle-info -v bundle')
target = self.make_branch('target')
md = merge_directive.MergeDirective2.from_objects(
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py 2007-11-21 22:16:20 +0000
+++ b/bzrlib/tests/test_dirstate.py 2008-02-13 01:35:27 +0000
@@ -646,6 +646,45 @@
finally:
state.unlock()
+ def test_save_refuses_if_changes_aborted(self):
+ self.build_tree(['a-file', 'a-dir/'])
+ state = dirstate.DirState.initialize('dirstate')
+ try:
+ # No stat and no sha1 sum.
+ state.add('a-file', 'a-file-id', 'file', None, '')
+ state.save()
+ finally:
+ state.unlock()
+
+ # The dirstate should include TREE_ROOT and 'a-file' and nothing else
+ expected_blocks = [
+ ('', [(('', '', 'TREE_ROOT'),
+ [('d', '', 0, False, dirstate.DirState.NULLSTAT)])]),
+ ('', [(('', 'a-file', 'a-file-id'),
+ [('f', '', 0, False, dirstate.DirState.NULLSTAT)])]),
+ ]
+
+ state = dirstate.DirState.on_file('dirstate')
+ state.lock_write()
+ try:
+ state._read_dirblocks_if_needed()
+ self.assertEqual(expected_blocks, state._dirblocks)
+
+ # Now modify the state, but mark it as inconsistent
+ state.add('a-dir', 'a-dir-id', 'directory', None, '')
+ state._changes_aborted = True
+ state.save()
+ finally:
+ state.unlock()
+
+ state = dirstate.DirState.on_file('dirstate')
+ state.lock_read()
+ try:
+ state._read_dirblocks_if_needed()
+ self.assertEqual(expected_blocks, state._dirblocks)
+ finally:
+ state.unlock()
+
class TestDirStateInitialize(TestCaseWithDirState):
=== modified file 'bzrlib/tests/test_errors.py'
--- a/bzrlib/tests/test_errors.py 2008-01-25 10:46:10 +0000
+++ b/bzrlib/tests/test_errors.py 2008-02-13 01:42:47 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2008 Canonical Ltd
# Authors: Robert Collins <robert.collins at canonical.com>
# and others
#
@@ -29,6 +29,13 @@
class TestErrors(TestCaseWithTransport):
+ def test_corrupt_dirstate(self):
+ error = errors.CorruptDirstate('path/to/dirstate', 'the reason why')
+ self.assertEqualDiff(
+ "Inconsistency in dirstate file path/to/dirstate.\n"
+ "Error: the reason why",
+ str(error))
+
def test_disabled_method(self):
error = errors.DisabledMethod("class name")
self.assertEqualDiff(
@@ -51,6 +58,13 @@
'It supports versions "(4, 5, 6)" to "(7, 8, 9)".',
str(error))
+ def test_inconsistent_delta(self):
+ error = errors.InconsistentDelta('path', 'file-id', 'reason for foo')
+ self.assertEqualDiff(
+ "An inconsistent delta was supplied involving 'path', 'file-id'\n"
+ "reason: reason for foo",
+ str(error))
+
def test_in_process_transport(self):
error = errors.InProcessTransport('fpp')
self.assertEqualDiff(
=== modified file 'bzrlib/tests/test_progress.py'
--- a/bzrlib/tests/test_progress.py 2007-12-30 18:20:15 +0000
+++ b/bzrlib/tests/test_progress.py 2008-02-13 03:30:01 +0000
@@ -30,6 +30,7 @@
class FakeStack:
+
def __init__(self, top):
self.__top = top
@@ -52,6 +53,7 @@
class TestProgress(TestCase):
+
def setUp(self):
q = DummyProgress()
self.top = ChildProgress(_stack=FakeStack(q))
=== modified file 'bzrlib/tests/test_workingtree_4.py'
--- a/bzrlib/tests/test_workingtree_4.py 2007-09-17 05:33:56 +0000
+++ b/bzrlib/tests/test_workingtree_4.py 2008-02-04 21:12:49 +0000
@@ -574,3 +574,99 @@
changes = [c[1] for c in tree._iter_changes(basis)]
self.assertEqual([], changes)
self.assertEqual(['', 'versioned', 'versioned2'], returned)
+
+
+class TestCorruptDirstate(TestCaseWithTransport):
+ """Tests for how we handle when the dirstate has been corrupted."""
+
+ def create_wt4(self):
+ control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
+ control.create_repository()
+ control.create_branch()
+ tree = workingtree_4.WorkingTreeFormat4().initialize(control)
+ return tree
+
+ def test_invalid_rename(self):
+ tree = self.create_wt4()
+ # Create a corrupted dirstate
+ tree.lock_write()
+ try:
+ tree.commit('init') # We need a parent, or we always compare with NULL
+ state = tree.current_dirstate()
+ state._read_dirblocks_if_needed()
+ # Now add in an invalid entry, a rename with a dangling pointer
+ state._dirblocks[1][1].append((('', 'foo', 'foo-id'),
+ [('f', '', 0, False, ''),
+ ('r', 'bar', 0 , False, '')]))
+ self.assertListRaises(errors.CorruptDirstate,
+ tree._iter_changes, tree.basis_tree())
+ finally:
+ tree.unlock()
+
+ def get_simple_dirblocks(self, state):
+ """Extract the simple information from the DirState.
+
+ This returns the dirblocks, only with the sha1sum and stat details
+ filtered out.
+ """
+ simple_blocks = []
+ for block in state._dirblocks:
+ simple_block = (block[0], [])
+ for entry in block[1]:
+ # Include the key for each entry, and for each parent include
+ # just the minikind, so we know if it was
+ # present/absent/renamed/etc
+ simple_block[1].append((entry[0], [i[0] for i in entry[1]]))
+ simple_blocks.append(simple_block)
+ return simple_blocks
+
+ def test_update_basis_with_invalid_delta(self):
+ """When given an invalid delta, it should abort, and not be saved."""
+ self.build_tree(['dir/', 'dir/file'])
+ tree = self.create_wt4()
+ tree.lock_write()
+ self.addCleanup(tree.unlock)
+ tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
+ first_revision_id = tree.commit('init')
+
+ root_id = tree.path2id('')
+ state = tree.current_dirstate()
+ state._read_dirblocks_if_needed()
+ self.assertEqual([
+ ('', [(('', '', root_id), ['d', 'd'])]),
+ ('', [(('', 'dir', 'dir-id'), ['d', 'd'])]),
+ ('dir', [(('dir', 'file', 'file-id'), ['f', 'f'])]),
+ ], self.get_simple_dirblocks(state))
+
+ tree.remove(['dir/file'])
+ self.assertEqual([
+ ('', [(('', '', root_id), ['d', 'd'])]),
+ ('', [(('', 'dir', 'dir-id'), ['d', 'd'])]),
+ ('dir', [(('dir', 'file', 'file-id'), ['a', 'f'])]),
+ ], self.get_simple_dirblocks(state))
+ # Make sure the removal is written to disk
+ tree.flush()
+
+ # self.assertRaises(Exception, tree.update_basis_by_delta,
+ new_dir = inventory.InventoryDirectory('dir-id', 'new-dir', root_id)
+ new_dir.revision = 'new-revision-id'
+ new_file = inventory.InventoryFile('file-id', 'new-file', root_id)
+ new_file.revision = 'new-revision-id'
+ self.assertRaises(errors.InconsistentDelta,
+ tree.update_basis_by_delta, 'new-revision-id',
+ [('dir', 'new-dir', 'dir-id', new_dir),
+ ('dir/file', 'new-dir/new-file', 'file-id', new_file),
+ ])
+ del state
+
+ # Now when we re-read the file it should not have been modified
+ tree.unlock()
+ tree.lock_read()
+ self.assertEqual(first_revision_id, tree.last_revision())
+ state = tree.current_dirstate()
+ state._read_dirblocks_if_needed()
+ self.assertEqual([
+ ('', [(('', '', root_id), ['d', 'd'])]),
+ ('', [(('', 'dir', 'dir-id'), ['d', 'd'])]),
+ ('dir', [(('dir', 'file', 'file-id'), ['a', 'f'])]),
+ ], self.get_simple_dirblocks(state))
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-12-29 21:28:32 +0000
+++ b/bzrlib/workingtree_4.py 2008-02-11 11:24:11 +0000
@@ -1951,6 +1951,11 @@
path_utf8=old_path)
# update the source details variable to be the real
# location.
+ if old_entry == (None, None):
+ raise errors.CorruptDirstate(state._filename,
+ "entry '%s/%s' is considered renamed from %r"
+ " but source does not exist\n"
+ "entry: %s" % (entry[0][0], entry[0][1], old_path, entry))
source_details = old_entry[1][source_index]
source_minikind = source_details[0]
else:
More information about the bazaar-commits
mailing list