Rev 3521: Fix check to understand split up .bzr format (Daniel Mark Watkins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jul 4 04:56:34 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3521
revision-id:pqm at pqm.ubuntu.com-20080704035620-zy61drff8onhjxno
parent: pqm at pqm.ubuntu.com-20080704034121-6ysq01uf3p1h97aj
parent: ian.clatworthy at canonical.com-20080704032914-ymz2feecr4qxe160
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-04 04:56:20 +0100
message:
Fix check to understand split up .bzr format (Daniel Mark Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3519.1.1
revision-id:ian.clatworthy at canonical.com-20080704032914-ymz2feecr4qxe160
parent: pqm at pqm.ubuntu.com-20080703180607-kxmp7ftyw7sqg5gj
parent: d.m.watkins at warwick.ac.uk-20080703070624-ec2e2wpettstd7vu
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Fri 2008-07-04 13:29:14 +1000
message:
Fix check to understand split up .bzr format (Daniel Mark Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3015.3.59
revision-id:d.m.watkins at warwick.ac.uk-20080703070624-ec2e2wpettstd7vu
parent: d.m.watkins at warwick.ac.uk-20080702094023-6bflm4qxkr04276h
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Thu 2008-07-03 08:06:24 +0100
message:
Further tweaks as requested on-list.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.58
revision-id:d.m.watkins at warwick.ac.uk-20080702094023-6bflm4qxkr04276h
parent: d.m.watkins at warwick.ac.uk-20080702093319-n9w1cio6nwzh7a8v
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-07-02 10:40:23 +0100
message:
Various other cleanup as requested by reviews.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3015.3.57
revision-id:d.m.watkins at warwick.ac.uk-20080702093319-n9w1cio6nwzh7a8v
parent: d.m.watkins at warwick.ac.uk-20080702091353-yofktygdtomgi7d5
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-07-02 10:33:19 +0100
message:
Made changes to BzrDir.open_containing_tree_branch_or_repository suggested on list.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.56
revision-id:d.m.watkins at warwick.ac.uk-20080702091353-yofktygdtomgi7d5
parent: d.m.watkins at warwick.ac.uk-20080702090237-qtn6g7z6dbmaetx5
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-07-02 10:13:53 +0100
message:
Updated deprecation information.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.55
revision-id:d.m.watkins at warwick.ac.uk-20080702090237-qtn6g7z6dbmaetx5
parent: d.m.watkins at warwick.ac.uk-20080702085724-ccw1s01og5wkcaff
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-07-02 10:02:37 +0100
message:
Updated NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3015.3.54
revision-id:d.m.watkins at warwick.ac.uk-20080702085724-ccw1s01og5wkcaff
parent: d.m.watkins at warwick.ac.uk-20080423094333-ijlkcji5mybita2j
parent: pqm at pqm.ubuntu.com-20080701042123-zcmqzb7o6znwjx34
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-07-02 09:57:24 +0100
message:
Merged bzr.dev r3515.
removed:
bzrlib/store/revision/__init__.py __init__.py-20060303014707-305238f06ae20dae
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/interversionedfile_implementations/ interversionedfile_implementations-20060301230427-f1f3ca8ddd5ff482
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/revisionstore_implementations/ revisionstore_implementations-20060303020702-1d2e36b63cef2706
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
added:
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/tests/blackbox/test_alias.py test_alias.py-20080425112253-fbt0yz1c1834jriz-1
bzrlib/tests/blackbox/test_modified.py test_modified.py-20080424085848-nwqjenan4dq2vq3w-1
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
bzrlib/tests/file_utils.py file_utils.py-20080506145406-a1h3ydg2lsh2iriy-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository_reference/ repository_external_-20080220025549-nnm2s80it1lvcwnc-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/per_repository_reference/test_add_revision.py test_add_revision.py-20080220034108-ao1u8qgakqbo5a08-1
bzrlib/tests/per_repository_reference/test_add_signature_text.py test_add_signature_t-20080220041905-1j2g4lyz3c6h34v4-1
bzrlib/tests/per_repository_reference/test_all_revision_ids.py test_all_revision_id-20080220041905-1j2g4lyz3c6h34v4-2
bzrlib/tests/per_repository_reference/test_break_lock.py test_break_lock.py-20080220042825-1f48qmpnuqqp5wg2-1
bzrlib/tests/per_repository_reference/test_check.py test_check.py-20080220044229-sxxe747gzi6q8fyv-1
bzrlib/tests/repository_implementations/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/developers/repository-stream.txt repositorystream.txt-20080410222511-nh6b9bvscvcerh48-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
doc/es/ es-20080504181154-x2fm3oprvjohiz7n-1
doc/es/guia-desarrollador/ guiadesarrollador-20080504181514-qlh50dq1mj769bic-1
doc/es/guia-usuario/ guiausuario-20080504181514-qlh50dq1mj769bic-2
doc/es/guia-usuario/index.txt index.txt-20080512005856-hgdxkh9xo58n7zdp-2
doc/es/guia-usuario/resolving_conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
doc/es/guia-usuario/version_info.txt version_info.txt-20080504181730-u24nugzokrcrk1bf-1
doc/es/mini-tutorial/ minitutorial-20080504181514-qlh50dq1mj769bic-3
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
doc/es/notas-version/ notasversion-20080504181514-qlh50dq1mj769bic-4
doc/es/referencia/ referencia-20080504181514-qlh50dq1mj769bic-5
doc/es/referencia-rapida/ referenciarapida-20080504181514-qlh50dq1mj769bic-6
doc/es/referencia-rapida/Makefile makefile-20080506002609-y60mr4avuqwzlf4s-1
doc/es/referencia-rapida/referencia-rapida.svg referenciarapida.svg-20080506002609-y60mr4avuqwzlf4s-2
doc/index.es.txt index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
renamed:
doc/en/user-guide/best_practice_intro.txt => doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/revnos.txt => doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/decorators.py decorators.py-20060112082512-6bfc2d882df1698d
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/doc/__init__.py __init__.py-20051224020731-eb3eb3ef5b4570df
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/hashcache.py hashcache.py-20050706091756-fe3a8cc1143ff24f
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/authentication.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/intset.py intset.py-20050717175247-81cd658f9aaa2731
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lazy_import.py lazy_import.py-20060910203832-f77c54gf3n232za0-1
bzrlib/lazy_regex.py lazy_regex.py-20061009091222-fyettq6z5qomdl9e-1
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/patches.py patches.py-20050727183609-378c1cc5972ce908
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
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/rio.py rio.py-20051128032247-770b120b34dfff60
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/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/__init__.py store.py-20050309040759-164dc5173d6406c2
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tag.py tag.py-20070212110532-91cw79inah2cfozx-1
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
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/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/ftp_server.py ftpserver.py-20071019102346-61jbvdkrr70igauv-1
bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
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_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_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
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/repository_implementations/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/stub_sftp.py stub_sftp.py-20051027032739-0e7ef4f7bab0e174
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
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_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_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-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_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
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_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
bzrlib/tests/test_patches.py test_patches.py-20051231203844-f4974d20f6aea09c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-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_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
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_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_strace.py test_strace.py-20070323001526-6zquhhw8leb9m6j8-2
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_switch.py test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
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_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
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_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
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/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/treeshape.py treeshape.py-20051004094628-312a98f0194306a8
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_set_root_id.py test_set_root_id.py-20061004073850-0r1c7qikmnkb8m9k-1
bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/textui.py textui.py-20050309040759-5d0cebe09c528e7d
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transactions.py transactions.py-20051007010900-f1313d53cf58e223
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/fakenfs.py fakenfs.py-20060402223312-0e29c7275aa384dd
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/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
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/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
bzrlib/tuned_gzip.py tuned_gzip.py-20060407014720-5aadc518e928e8d2
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
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-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
contrib/bzr_access bzr_access-20071210163004-c9lb1renhra2ncg0-1
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-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/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/releasing_a_project.txt releasing_a_project.-20071121073725-0corxykv5irjal00-5
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/index.txt index.txt-20070813101924-07gd9i9d2jt124bf-1
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/zen.txt revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
------------------------------------------------------------
revno: 3015.3.53
revision-id:d.m.watkins at warwick.ac.uk-20080423094333-ijlkcji5mybita2j
parent: d.m.watkins at warwick.ac.uk-20080423093325-u1lj30d9jbzo8aec
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-04-23 10:43:33 +0100
message:
Fixed NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3015.3.52
revision-id:d.m.watkins at warwick.ac.uk-20080423093325-u1lj30d9jbzo8aec
parent: d.m.watkins at warwick.ac.uk-20080420050823-fh2v7ycwsw1z6sfj
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Wed 2008-04-23 10:33:25 +0100
message:
Replaced use of os functions with use of test suite functions.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.51
revision-id:d.m.watkins at warwick.ac.uk-20080420050823-fh2v7ycwsw1z6sfj
parent: d.m.watkins at warwick.ac.uk-20080420050117-ddrpjhc9woqjhw51
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Sun 2008-04-20 06:08:23 +0100
message:
Modified open_containing_tree_branch_or_repository as per Aaron's suggestion.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3015.3.50
revision-id:d.m.watkins at warwick.ac.uk-20080420050117-ddrpjhc9woqjhw51
parent: d.m.watkins at warwick.ac.uk-20080317024539-7aoyqajf0qphlweq
parent: pqm at pqm.ubuntu.com-20080419002305-25ayhxp3m0b95e9c
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Sun 2008-04-20 06:01:17 +0100
message:
Merged bzr.dev r3374.
removed:
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
added:
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_uncommit.py test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
bzrlib/transport/nosmart.py nosmart.py-20080402095843-6ib17idympwy1zkr-1
bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml6.py xml6.py-20080327235607-1skmbg4o9cd1o636-1
doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
doc/developers/plugin-api.txt pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
renamed:
bzrlib/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-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/__init__.py changeset.py-20050513021216-b02ab57fb9738913
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/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-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/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/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
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/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-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/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
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/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
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/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
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/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
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_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
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_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
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_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
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_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
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/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-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/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/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
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/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 3015.3.49
revision-id:d.m.watkins at warwick.ac.uk-20080317024539-7aoyqajf0qphlweq
parent: d.m.watkins at warwick.ac.uk-20080315004920-tb6xijik8kxds1gb
parent: pqm at pqm.ubuntu.com-20080317014832-s8bbb26w0qnrklcp
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-17 02:45:39 +0000
message:
Merged bzr.dev r3288, updating to 1.4.
added:
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3015.3.48
revision-id:d.m.watkins at warwick.ac.uk-20080315004920-tb6xijik8kxds1gb
parent: d.m.watkins at warwick.ac.uk-20080315003745-96q047tcxl5bwcwa
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Sat 2008-03-15 00:49:20 +0000
message:
Further granulated tests.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.47
revision-id:d.m.watkins at warwick.ac.uk-20080315003745-96q047tcxl5bwcwa
parent: d.m.watkins at warwick.ac.uk-20080315003306-b93a8hsd53htuz8d
parent: pqm at pqm.ubuntu.com-20080314225929-4y11nn6gml5qfzz1
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Sat 2008-03-15 00:37:45 +0000
message:
Merged bzr.dev r3278.
added:
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
------------------------------------------------------------
revno: 3015.3.46
revision-id:d.m.watkins at warwick.ac.uk-20080315003306-b93a8hsd53htuz8d
parent: d.m.watkins at warwick.ac.uk-20080315002951-c8dl9pdft3i7cy2e
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Sat 2008-03-15 00:33:06 +0000
message:
Made tests more granular.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.45
revision-id:d.m.watkins at warwick.ac.uk-20080315002951-c8dl9pdft3i7cy2e
parent: d.m.watkins at warwick.ac.uk-20080314191152-opdl0d1uc51g95tg
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Sat 2008-03-15 00:29:51 +0000
message:
Extract common method.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.44
revision-id:d.m.watkins at warwick.ac.uk-20080314191152-opdl0d1uc51g95tg
parent: d.m.watkins at warwick.ac.uk-20080314182532-t4jub80nxp0u2lv4
parent: pqm at pqm.ubuntu.com-20080314152947-u92b6klpfcnigv4e
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 19:11:52 +0000
message:
Merged bzr.dev r3276.
added:
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3015.3.43
revision-id:d.m.watkins at warwick.ac.uk-20080314182532-t4jub80nxp0u2lv4
parent: d.m.watkins at warwick.ac.uk-20080314182507-fr8kirvy0h29ex2f
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 18:25:32 +0000
message:
Now find containing repo.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3015.3.42
revision-id:d.m.watkins at warwick.ac.uk-20080314182507-fr8kirvy0h29ex2f
parent: d.m.watkins at warwick.ac.uk-20080314165825-j95754jpu0qzhq0h
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 18:25:07 +0000
message:
Added test to ensure that BzrDir.open_containing_tree_branch_or_repository will open containing versioned directories of unversioned subdirectories.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.41
revision-id:d.m.watkins at warwick.ac.uk-20080314165825-j95754jpu0qzhq0h
parent: d.m.watkins at warwick.ac.uk-20080314165353-irlv21o42n7ocxl1
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 16:58:25 +0000
message:
Added NEWS entry regarding bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3015.3.40
revision-id:d.m.watkins at warwick.ac.uk-20080314165353-irlv21o42n7ocxl1
parent: d.m.watkins at warwick.ac.uk-20080314162137-c468h73m0uxxh8jx
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 16:53:53 +0000
message:
Modified bzrlib.check.check_dwim to use bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.39
revision-id:d.m.watkins at warwick.ac.uk-20080314162137-c468h73m0uxxh8jx
parent: d.m.watkins at warwick.ac.uk-20080314161837-el4q1et5d15jnsij
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 16:21:37 +0000
message:
Added classmethod bzrlib.bzrdir.BzrDir.open_containing_tree_branch_or_repository.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3015.3.38
revision-id:d.m.watkins at warwick.ac.uk-20080314161837-el4q1et5d15jnsij
parent: d.m.watkins at warwick.ac.uk-20080311030339-hpfp030b3ais5018
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2008-03-14 16:18:37 +0000
message:
Added bzrlib.tests.test_bzrdir.test_open_containing_tree_branch_or_repository.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3015.3.37
revision-id:d.m.watkins at warwick.ac.uk-20080311030339-hpfp030b3ais5018
parent: d.m.watkins at warwick.ac.uk-20080311023451-6stbosmcs6py0mz7
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-03-11 03:03:39 +0000
message:
Added deprecation comment to docstring.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.36
revision-id:d.m.watkins at warwick.ac.uk-20080311023451-6stbosmcs6py0mz7
parent: d.m.watkins at warwick.ac.uk-20080311022029-76cp0n8gzhchs0pa
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-03-11 02:34:51 +0000
message:
Added NEWS entry regarding deprecation.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3015.3.35
revision-id:d.m.watkins at warwick.ac.uk-20080311022029-76cp0n8gzhchs0pa
parent: d.m.watkins at warwick.ac.uk-20080310235252-mz73twka2npf8nqo
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-03-11 02:20:29 +0000
message:
Reintroduced bzrlib.check.check() with a deprecation warning.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.34
revision-id:d.m.watkins at warwick.ac.uk-20080310235252-mz73twka2npf8nqo
parent: d.m.watkins at warwick.ac.uk-20080310235130-p4xt2bqzpjxk1z7k
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:52:52 +0000
message:
Cleared out BRANCH.TODO.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
------------------------------------------------------------
revno: 3015.3.33
revision-id:d.m.watkins at warwick.ac.uk-20080310235130-p4xt2bqzpjxk1z7k
parent: d.m.watkins at warwick.ac.uk-20080310234532-ljjdiliz909emuod
parent: pqm at pqm.ubuntu.com-20080310233945-ed3k1rc4g1p9qcpj
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:51:30 +0000
message:
Merged bzr.dev r3262.
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-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/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
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/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
------------------------------------------------------------
revno: 3015.3.32
revision-id:d.m.watkins at warwick.ac.uk-20080310234532-ljjdiliz909emuod
parent: d.m.watkins at warwick.ac.uk-20080310234505-b2yaxkkt4u0h2def
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:45:32 +0000
message:
Added blackbox test to ensure roughly correct output from check.
modified:
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
------------------------------------------------------------
revno: 3015.3.31
revision-id:d.m.watkins at warwick.ac.uk-20080310234505-b2yaxkkt4u0h2def
parent: d.m.watkins at warwick.ac.uk-20080310232031-nny93rye0ruh4850
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:45:05 +0000
message:
Fixed accidental rearranging of _get_elements return order.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.30
revision-id:d.m.watkins at warwick.ac.uk-20080310232031-nny93rye0ruh4850
parent: d.m.watkins at warwick.ac.uk-20080310231503-ikagjjbxnyfoxtrt
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:20:31 +0000
message:
Moved check to WorkingTree.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3015.3.29
revision-id:d.m.watkins at warwick.ac.uk-20080310231503-ikagjjbxnyfoxtrt
parent: d.m.watkins at warwick.ac.uk-20080310230120-f7jiu1gs572kwkcj
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:15:03 +0000
message:
Rerranged _get_elements.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.28
revision-id:d.m.watkins at warwick.ac.uk-20080310230120-f7jiu1gs572kwkcj
parent: d.m.watkins at warwick.ac.uk-20080303150618-etsmlv1ijs1k4lfc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-10 23:01:20 +0000
message:
Whitespace fix.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.27
revision-id:d.m.watkins at warwick.ac.uk-20080303150618-etsmlv1ijs1k4lfc
parent: d.m.watkins at warwick.ac.uk-20080226042233-foh0lu6c1jov0znd
parent: pqm at pqm.ubuntu.com-20080229011300-p50it0si2y8mbv0d
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-03-03 15:06:18 +0000
message:
Merged bzr.dev r3246.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
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/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
------------------------------------------------------------
revno: 3015.3.26
revision-id:d.m.watkins at warwick.ac.uk-20080226042233-foh0lu6c1jov0znd
parent: d.m.watkins at warwick.ac.uk-20080226035325-kix1r728zbo4v4vp
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 04:22:33 +0000
message:
Added NEWS item.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3015.3.25
revision-id:d.m.watkins at warwick.ac.uk-20080226035325-kix1r728zbo4v4vp
parent: d.m.watkins at warwick.ac.uk-20080226034341-l1om7qt74wdrms3h
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 03:53:25 +0000
message:
Updated help.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3015.3.24
revision-id:d.m.watkins at warwick.ac.uk-20080226034341-l1om7qt74wdrms3h
parent: d.m.watkins at warwick.ac.uk-20080226023033-hl1ul2q2gd0owxk5
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 03:43:41 +0000
message:
Added indication of what is being checked.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.23
revision-id:d.m.watkins at warwick.ac.uk-20080226023033-hl1ul2q2gd0owxk5
parent: d.m.watkins at warwick.ac.uk-20080226022131-xutpkpd41me6poyt
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 02:30:33 +0000
message:
Abstracted discovery of elements away.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.22
revision-id:d.m.watkins at warwick.ac.uk-20080226022131-xutpkpd41me6poyt
parent: d.m.watkins at warwick.ac.uk-20080226021806-gljgrro5ah5an7de
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 02:21:31 +0000
message:
Changed 'check' to 'check_dwim'.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.21
revision-id:d.m.watkins at warwick.ac.uk-20080226021806-gljgrro5ah5an7de
parent: d.m.watkins at warwick.ac.uk-20080226021209-50meb5digz2abdyx
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 02:18:06 +0000
message:
Fixed misused 'repository'.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.20
revision-id:d.m.watkins at warwick.ac.uk-20080226021209-50meb5digz2abdyx
parent: d.m.watkins at warwick.ac.uk-20080226015856-e1i8z0feo8cvtrv6
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 02:12:09 +0000
message:
Made code path a little clearer.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.19
revision-id:d.m.watkins at warwick.ac.uk-20080226015856-e1i8z0feo8cvtrv6
parent: d.m.watkins at warwick.ac.uk-20080226015609-a5y9csqc024hk9ek
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 01:58:56 +0000
message:
Repositories are now held read-locked for as long as possible.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.18
revision-id:d.m.watkins at warwick.ac.uk-20080226015609-a5y9csqc024hk9ek
parent: d.m.watkins at warwick.ac.uk-20080226012144-yw2yo2mdfgb9il9d
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 01:56:09 +0000
message:
Improved errors.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.17
revision-id:d.m.watkins at warwick.ac.uk-20080226012144-yw2yo2mdfgb9il9d
parent: d.m.watkins at warwick.ac.uk-20080226004103-yz4bw5ruvin0ekyz
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 01:21:44 +0000
message:
Consolidated WT checking.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.16
revision-id:d.m.watkins at warwick.ac.uk-20080226004103-yz4bw5ruvin0ekyz
parent: d.m.watkins at warwick.ac.uk-20080226002928-i67i78vc730khhbh
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 00:41:03 +0000
message:
Updated BRANCH.TODO.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
------------------------------------------------------------
revno: 3015.3.15
revision-id:d.m.watkins at warwick.ac.uk-20080226002928-i67i78vc730khhbh
parent: d.m.watkins at warwick.ac.uk-20080226001925-3q41a43xqd3fog7r
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 00:29:28 +0000
message:
Changed to using existing methods for finding branches.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.14
revision-id:d.m.watkins at warwick.ac.uk-20080226001925-3q41a43xqd3fog7r
parent: d.m.watkins at warwick.ac.uk-20080225190220-tx1p02ymv913pqoo
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Tue 2008-02-26 00:19:25 +0000
message:
Fixed WT check bug.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.13
revision-id:d.m.watkins at warwick.ac.uk-20080225190220-tx1p02ymv913pqoo
parent: d.m.watkins at warwick.ac.uk-20080225190011-rljlj7qoqz41yqm4
parent: pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-02-25 19:02:20 +0000
message:
Merged bzr.dev.
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/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-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_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/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-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
tools/package_mf.py package_mf.py-20080206141953-323gd0qb2z3tn5pc-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/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
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/info.py info.py-20050323235939-6bbfe7d9700b0b9b
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/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-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_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
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_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_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.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
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_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_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_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
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/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
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/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: 3015.3.12
revision-id:d.m.watkins at warwick.ac.uk-20080225190011-rljlj7qoqz41yqm4
parent: d.m.watkins at warwick.ac.uk-20071123034748-iytf5wlqumgo7zew
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Mon 2008-02-25 19:00:11 +0000
message:
Added poolie's mail to BRANCH.TODO.
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
------------------------------------------------------------
revno: 3015.3.11
revision-id:d.m.watkins at warwick.ac.uk-20071123034748-iytf5wlqumgo7zew
parent: d.m.watkins at warwick.ac.uk-20071123033742-k4ez6d0flpy3n1vw
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 03:47:48 +0000
message:
Move WT checking from builtins to check.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.10
revision-id:d.m.watkins at warwick.ac.uk-20071123033742-k4ez6d0flpy3n1vw
parent: d.m.watkins at warwick.ac.uk-20071123033450-b2u0cy0lxccynqio
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 03:37:42 +0000
message:
Reorganised comments.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.9
revision-id:d.m.watkins at warwick.ac.uk-20071123033450-b2u0cy0lxccynqio
parent: d.m.watkins at warwick.ac.uk-20071123033208-beg4260syhw30x5i
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 03:34:50 +0000
message:
Scan for branches and check them.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.8
revision-id:d.m.watkins at warwick.ac.uk-20071123033208-beg4260syhw30x5i
parent: d.m.watkins at warwick.ac.uk-20071123024416-8h46w7tpvefsjfkk
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 03:32:08 +0000
message:
Added _scan_for_branches.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.7
revision-id:d.m.watkins at warwick.ac.uk-20071123024416-8h46w7tpvefsjfkk
parent: d.m.watkins at warwick.ac.uk-20071123022617-m3ly6ce5xidp4j71
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 02:44:16 +0000
message:
Fixed failing tests.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3015.3.6
revision-id:d.m.watkins at warwick.ac.uk-20071123022617-m3ly6ce5xidp4j71
parent: d.m.watkins at warwick.ac.uk-20071123015026-stjfqqbluwoqdscc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 02:26:17 +0000
message:
Fixed checking of working trees.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3015.3.5
revision-id:d.m.watkins at warwick.ac.uk-20071123015026-stjfqqbluwoqdscc
parent: d.m.watkins at warwick.ac.uk-20071123013613-2tb98v2wje2lyaza
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 01:50:26 +0000
message:
Removed needless duplication of repository checks.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.4
revision-id:d.m.watkins at warwick.ac.uk-20071123013613-2tb98v2wje2lyaza
parent: d.m.watkins at warwick.ac.uk-20071123012956-3o2ow102px7fibof
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 01:36:13 +0000
message:
If not in a branch or a repo, that check is simply skipped.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.3
revision-id:d.m.watkins at warwick.ac.uk-20071123012956-3o2ow102px7fibof
parent: d.m.watkins at warwick.ac.uk-20071123011821-732x978f8ol9uie6
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 01:29:56 +0000
message:
Added _check_repository.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.2
revision-id:d.m.watkins at warwick.ac.uk-20071123011821-732x978f8ol9uie6
parent: d.m.watkins at warwick.ac.uk-20071123011258-aonqw8g88qg14kvb
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 01:18:21 +0000
message:
Check.check now takes a path rather than a branch.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
------------------------------------------------------------
revno: 3015.3.1
revision-id:d.m.watkins at warwick.ac.uk-20071123011258-aonqw8g88qg14kvb
parent: pqm at pqm.ubuntu.com-20071122234103-fn117zncqrqv39me
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: check
timestamp: Fri 2007-11-23 01:12:58 +0000
message:
Abstracted branch-checking logic.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
=== modified file 'NEWS'
--- a/NEWS 2008-07-04 03:41:21 +0000
+++ b/NEWS 2008-07-04 03:56:20 +0000
@@ -37,6 +37,10 @@
BUGFIXES:
+ * ``check`` handles the split-up .bzr layout correctly, so no longer
+ requires a branch to be present.
+ (Daniel Watkins, #64783)
+
* Clearer message about how to set the PYTHONPATH if bzrlib can't be
loaded.
(Martin Pool, #205230)
@@ -96,6 +100,10 @@
parameter. If you have a subclass of ``Branch`` that overrides
``pull`` then you should add this parameter. (Andrew Bennetts)
+ * ``bzrlib.check.check()`` has been deprecated in favour of the more
+ aptly-named ``bzrlib.check.check_branch()``.
+ (Daniel Watkins)
+
* ``Tree.print_file`` and ``Repository.print_file`` are deprecated.
These methods are bad APIs because they write directly to sys.stdout.
bzrlib does not use them internally, and there are no direct tests
@@ -106,6 +114,11 @@
* ``cat`` command no longer uses ``Tree.print_file()`` internally.
(Alexander Belchenko)
+ * New class method ``BzrDir.open_containing_tree_branch_or_repository``
+ which eases the discovery of the tree, the branch and the repository
+ containing a given location.
+ (Daniel Watkins)
+
* New ``versionedfile.KeyMapper`` interface to abstract out the access to
underlying .knit/.kndx etc files in repositories with partitioned
storage. (Robert Collins)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-07-02 01:40:02 +0000
+++ b/bzrlib/builtins.py 2008-07-04 03:29:14 +0000
@@ -2385,12 +2385,14 @@
class cmd_check(Command):
- """Validate consistency of branch history.
-
- This command checks various invariants about the branch storage to
- detect data corruption or bzr bugs.
-
- Output fields:
+ """Validate working tree structure, branch consistency and repository
+ history.
+
+ This command checks various invariants about branch and repository storage
+ to detect data corruption or bzr bugs.
+
+ The working tree and branch checks will only give output if a problem is
+ detected. The output fields of the repository check are:
revisions: This is just the number of revisions checked. It doesn't
indicate a problem.
@@ -2408,42 +2410,14 @@
"""
_see_also = ['reconcile']
- takes_args = ['branch?']
+ takes_args = ['path?']
takes_options = ['verbose']
- def run(self, branch=None, verbose=False):
- from bzrlib.check import check
- if branch is None:
- branch_obj = Branch.open_containing('.')[0]
- else:
- branch_obj = Branch.open(branch)
- check(branch_obj, verbose)
- # bit hacky, check the tree parent is accurate
- try:
- if branch is None:
- tree = WorkingTree.open_containing('.')[0]
- else:
- tree = WorkingTree.open(branch)
- except (errors.NoWorkingTree, errors.NotLocalUrl):
- pass
- else:
- # This is a primitive 'check' for tree state. Currently this is not
- # integrated into the main check logic as yet.
- tree.lock_read()
- try:
- tree_basis = tree.basis_tree()
- tree_basis.lock_read()
- try:
- repo_basis = tree.branch.repository.revision_tree(
- tree.last_revision())
- if len(list(repo_basis.iter_changes(tree_basis))):
- raise errors.BzrCheckError(
- "Mismatched basis inventory content.")
- tree._validate()
- finally:
- tree_basis.unlock()
- finally:
- tree.unlock()
+ def run(self, path=None, verbose=False):
+ from bzrlib.check import check_dwim
+ if path is None:
+ path = '.'
+ check_dwim(path, verbose)
class cmd_upgrade(Command):
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-06-18 07:56:09 +0000
+++ b/bzrlib/bzrdir.py 2008-07-03 07:06:24 +0000
@@ -61,6 +61,7 @@
sha_strings,
sha_string,
)
+from bzrlib.repository import Repository
from bzrlib.smart.client import _SmartClient
from bzrlib.smart import protocol
from bzrlib.store.versioned import WeaveStore
@@ -844,6 +845,31 @@
tree, branch = bzrdir._get_tree_branch()
return tree, branch, relpath
+ @classmethod
+ def open_containing_tree_branch_or_repository(klass, location):
+ """Return the working tree, branch and repo contained by a location.
+
+ Returns (tree, branch, repository, relpath).
+ If there is no tree containing the location, tree will be None.
+ If there is no branch containing the location, branch will be None.
+ If there is no repository containing the location, repository will be
+ None.
+ relpath is the portion of the path that is contained by the innermost
+ BzrDir.
+
+ If no tree, branch or repository is found, a NotBranchError is raised.
+ """
+ bzrdir, relpath = klass.open_containing(location)
+ try:
+ tree, branch = bzrdir._get_tree_branch()
+ except errors.NotBranchError:
+ try:
+ repo = bzrdir.find_repository()
+ return None, None, repo, relpath
+ except (errors.NoRepositoryPresent):
+ raise errors.NotBranchError(location)
+ return tree, branch, branch.repository, relpath
+
def open_repository(self, _unsupported=False):
"""Open the repository object at this BzrDir if one is present.
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py 2008-06-11 07:22:00 +0000
+++ b/bzrlib/check.py 2008-07-03 07:06:24 +0000
@@ -32,12 +32,17 @@
# raising them. If there's more than one exception it'd be good to see them
# all.
-from bzrlib import errors
+from bzrlib import errors, osutils
from bzrlib import repository as _mod_repository
from bzrlib import revision
+from bzrlib.branch import Branch
+from bzrlib.bzrdir import BzrDir
from bzrlib.errors import BzrCheckError
+from bzrlib.repository import Repository
+from bzrlib.symbol_versioning import deprecated_function, deprecated_in
+from bzrlib.trace import log_error, note
import bzrlib.ui
-from bzrlib.trace import log_error, note
+from bzrlib.workingtree import WorkingTree
class Check(object):
"""Check a repository"""
@@ -236,21 +241,61 @@
seen_names[path] = True
+ at deprecated_function(deprecated_in((1,6,0)))
def check(branch, verbose):
"""Run consistency checks on a branch.
Results are reported through logging.
+ Deprecated in 1.6. Please use check_branch instead.
+
+ :raise BzrCheckError: if there's a consistency error.
+ """
+ check_branch(branch, verbose)
+
+
+def check_branch(branch, verbose):
+ """Run consistency checks on a branch.
+
+ Results are reported through logging.
+
:raise BzrCheckError: if there's a consistency error.
"""
branch.lock_read()
try:
branch_result = branch.check()
- repo_result = branch.repository.check([branch.last_revision()])
finally:
branch.unlock()
branch_result.report_results(verbose)
- repo_result.report_results(verbose)
-
-
-
+
+
+def check_dwim(path, verbose):
+ tree, branch, repo, relpath = BzrDir.open_containing_tree_branch_or_repository(path)
+
+ if tree is not None:
+ note("Checking working tree at '%s'."
+ % (tree.bzrdir.root_transport.base,))
+ tree._check()
+
+ if branch is not None:
+ # We have a branch
+ if repo is None:
+ # The branch is in a shared repository
+ repo = branch.repository
+ branches = [branch]
+ elif repo is not None:
+ branches = repo.find_branches(using=True)
+
+ if repo is not None:
+ repo.lock_read()
+ try:
+ note("Checking repository at '%s'."
+ % (repo.bzrdir.root_transport.base,))
+ result = repo.check()
+ result.report_results(verbose)
+ for branch in branches:
+ note("Checking branch at '%s'."
+ % (branch.bzrdir.root_transport.base,))
+ check_branch(branch, verbose)
+ finally:
+ repo.unlock()
=== modified file 'bzrlib/tests/blackbox/test_check.py'
--- a/bzrlib/tests/blackbox/test_check.py 2007-10-24 20:11:21 +0000
+++ b/bzrlib/tests/blackbox/test_check.py 2008-03-10 23:45:32 +0000
@@ -32,4 +32,14 @@
def test_check_one_commit_tree(self):
tree = self.make_branch_and_tree('.')
tree.commit('hallelujah')
- self.run_bzr('check')
+ out, err = self.run_bzr('check')
+ self.assertContainsRe(err, r"^Checking working tree at '.*'\.\n"
+ r"Checking repository at '.*'\.\n"
+ r"checked repository.*\n"
+ r" 1 revisions\n"
+ r" 0 file-ids\n"
+ r" 0 unique file texts\n"
+ r" 0 repeated file texts\n"
+ r" 0 unreferenced text versions\n"
+ r"Checking branch at '.*'\.\n"
+ r"checked branch.*\n$")
=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2008-06-11 04:20:16 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2008-07-02 08:57:24 +0000
@@ -36,7 +36,7 @@
workingtree,
)
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
-from bzrlib.check import check
+from bzrlib.check import check_branch
from bzrlib.errors import (FileExists,
NoSuchRevision,
NoSuchFile,
@@ -1484,7 +1484,8 @@
finally:
pb.finished()
# and it should pass 'check' now.
- check(bzrdir.BzrDir.open(self.get_url('.')).open_branch(), False)
+ check_branch(bzrdir.BzrDir.open(self.get_url('.')).open_branch(),
+ False)
def test_format_description(self):
dir = self.make_bzrdir('.')
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2008-05-02 07:31:24 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2008-07-02 09:33:19 +0000
@@ -19,6 +19,7 @@
For interface contract tests, see tests/bzr_dir_implementations.
"""
+import os
import os.path
from StringIO import StringIO
import subprocess
@@ -436,6 +437,9 @@
if not self.vfs_transport_factory == MemoryServer:
self.transport_readonly_server = HttpServer
+ def local_branch_path(self, branch):
+ return os.path.realpath(urlutils.local_path_from_url(branch.base))
+
def test_open_containing(self):
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing,
self.get_readonly_url(''))
@@ -447,6 +451,93 @@
branch, relpath = bzrdir.BzrDir.open_containing(self.get_readonly_url('g/p/q'))
self.assertEqual('g/p/q', relpath)
+ def test_open_containing_tree_branch_or_repository_empty(self):
+ self.assertRaises(errors.NotBranchError,
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository,
+ self.get_readonly_url(''))
+
+ def test_open_containing_tree_branch_or_repository_all(self):
+ self.make_branch_and_tree('topdir')
+ tree, branch, repo, relpath = \
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository(
+ 'topdir/foo')
+ self.assertEqual(os.path.realpath('topdir'),
+ os.path.realpath(tree.basedir))
+ self.assertEqual(os.path.realpath('topdir'),
+ self.local_branch_path(branch))
+ self.assertEqual(
+ os.path.realpath(os.path.join('topdir', '.bzr', 'repository')),
+ repo.bzrdir.transport.local_abspath('repository'))
+ self.assertEqual(relpath, 'foo')
+
+ def test_open_containing_tree_branch_or_repository_no_tree(self):
+ self.make_branch('branch')
+ tree, branch, repo, relpath = \
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository(
+ 'branch/foo')
+ self.assertEqual(tree, None)
+ self.assertEqual(os.path.realpath('branch'),
+ self.local_branch_path(branch))
+ self.assertEqual(
+ os.path.realpath(os.path.join('branch', '.bzr', 'repository')),
+ repo.bzrdir.transport.local_abspath('repository'))
+ self.assertEqual(relpath, 'foo')
+
+ def test_open_containing_tree_branch_or_repository_repo(self):
+ self.make_repository('repo')
+ tree, branch, repo, relpath = \
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository(
+ 'repo')
+ self.assertEqual(tree, None)
+ self.assertEqual(branch, None)
+ self.assertEqual(
+ os.path.realpath(os.path.join('repo', '.bzr', 'repository')),
+ repo.bzrdir.transport.local_abspath('repository'))
+ self.assertEqual(relpath, '')
+
+ def test_open_containing_tree_branch_or_repository_shared_repo(self):
+ self.make_repository('shared', shared=True)
+ bzrdir.BzrDir.create_branch_convenience('shared/branch',
+ force_new_tree=False)
+ tree, branch, repo, relpath = \
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository(
+ 'shared/branch')
+ self.assertEqual(tree, None)
+ self.assertEqual(os.path.realpath('shared/branch'),
+ self.local_branch_path(branch))
+ self.assertEqual(
+ os.path.realpath(os.path.join('shared', '.bzr', 'repository')),
+ repo.bzrdir.transport.local_abspath('repository'))
+ self.assertEqual(relpath, '')
+
+ def test_open_containing_tree_branch_or_repository_branch_subdir(self):
+ self.make_branch_and_tree('foo')
+ self.build_tree(['foo/bar/'])
+ tree, branch, repo, relpath = \
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository(
+ 'foo/bar')
+ self.assertEqual(os.path.realpath('foo'),
+ os.path.realpath(tree.basedir))
+ self.assertEqual(os.path.realpath('foo'),
+ self.local_branch_path(branch))
+ self.assertEqual(
+ os.path.realpath(os.path.join('foo', '.bzr', 'repository')),
+ repo.bzrdir.transport.local_abspath('repository'))
+ self.assertEqual(relpath, 'bar')
+
+ def test_open_containing_tree_branch_or_repository_repo_subdir(self):
+ self.make_repository('bar')
+ self.build_tree(['bar/baz/'])
+ tree, branch, repo, relpath = \
+ bzrdir.BzrDir.open_containing_tree_branch_or_repository(
+ 'bar/baz')
+ self.assertEqual(tree, None)
+ self.assertEqual(branch, None)
+ self.assertEqual(
+ os.path.realpath(os.path.join('bar', '.bzr', 'repository')),
+ repo.bzrdir.transport.local_abspath('repository'))
+ self.assertEqual(relpath, 'baz')
+
def test_open_containing_from_transport(self):
self.assertRaises(NotBranchError, bzrdir.BzrDir.open_containing_from_transport,
get_transport(self.get_readonly_url('')))
@@ -461,17 +552,13 @@
self.assertEqual('g/p/q', relpath)
def test_open_containing_tree_or_branch(self):
- def local_branch_path(branch):
- return os.path.realpath(
- urlutils.local_path_from_url(branch.base))
-
self.make_branch_and_tree('topdir')
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
'topdir/foo')
self.assertEqual(os.path.realpath('topdir'),
os.path.realpath(tree.basedir))
self.assertEqual(os.path.realpath('topdir'),
- local_branch_path(branch))
+ self.local_branch_path(branch))
self.assertIs(tree.bzrdir, branch.bzrdir)
self.assertEqual('foo', relpath)
# opening from non-local should not return the tree
@@ -485,20 +572,16 @@
'topdir/foo')
self.assertIs(tree, None)
self.assertEqual(os.path.realpath('topdir/foo'),
- local_branch_path(branch))
+ self.local_branch_path(branch))
self.assertEqual('', relpath)
def test_open_tree_or_branch(self):
- def local_branch_path(branch):
- return os.path.realpath(
- urlutils.local_path_from_url(branch.base))
-
self.make_branch_and_tree('topdir')
tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir')
self.assertEqual(os.path.realpath('topdir'),
os.path.realpath(tree.basedir))
self.assertEqual(os.path.realpath('topdir'),
- local_branch_path(branch))
+ self.local_branch_path(branch))
self.assertIs(tree.bzrdir, branch.bzrdir)
# opening from non-local should not return the tree
tree, branch = bzrdir.BzrDir.open_tree_or_branch(
@@ -509,7 +592,7 @@
tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir/foo')
self.assertIs(tree, None)
self.assertEqual(os.path.realpath('topdir/foo'),
- local_branch_path(branch))
+ self.local_branch_path(branch))
def test_open_from_transport(self):
# transport pointing at bzrdir should give a bzrdir with root transport
=== modified file 'bzrlib/workingtree.py'
--- a/bzrlib/workingtree.py 2008-07-02 01:40:02 +0000
+++ b/bzrlib/workingtree.py 2008-07-04 03:29:14 +0000
@@ -2453,6 +2453,20 @@
self.set_conflicts(un_resolved)
return un_resolved, resolved
+ @needs_read_lock
+ def _check(self):
+ tree_basis = self.basis_tree()
+ tree_basis.lock_read()
+ try:
+ repo_basis = self.branch.repository.revision_tree(
+ self.last_revision())
+ if len(list(repo_basis.iter_changes(tree_basis))) > 0:
+ raise errors.BzrCheckError(
+ "Mismatched basis inventory content.")
+ self._validate()
+ finally:
+ tree_basis.unlock()
+
def _validate(self):
"""Validate internal structures.
More information about the bazaar-commits
mailing list