Rev 3517: Make PreviewTree behavior more correct when changes are present in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Jul 2 20:51:17 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3517
revision-id:pqm at pqm.ubuntu.com-20080702195105-5gqthymygmtjrwaf
parent: pqm at pqm.ubuntu.com-20080702020417-2gnc111mzyl1xusr
parent: aaron at aaronbentley.com-20080702191803-8ton89iwa6p7h5ay
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-02 20:51:05 +0100
message:
Make PreviewTree behavior more correct when changes are present
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.39
revision-id:aaron at aaronbentley.com-20080702191803-8ton89iwa6p7h5ay
parent: aaron at aaronbentley.com-20080702132722-xoxdhvdlo2eg0q4a
parent: aaron at aaronbentley.com-20080702191745-u8dt7fe1riemgjxh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: is_executable
timestamp: Wed 2008-07-02 15:18:03 -0400
message:
Merge with stored_kind
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.36.1.2
revision-id:aaron at aaronbentley.com-20080702191745-u8dt7fe1riemgjxh
parent: aaron at aaronbentley.com-20080702132659-ofq4dotjwmhachh1
parent: aaron at aaronbentley.com-20080702191402-nwluvtfhhg8p7q71
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: stored_kind
timestamp: Wed 2008-07-02 15:17:45 -0400
message:
Merge with annotate
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.35.1.3
revision-id:aaron at aaronbentley.com-20080702191402-nwluvtfhhg8p7q71
parent: aaron at aaronbentley.com-20080702190910-7w7wdf65q5c0aq5l
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Wed 2008-07-02 15:14:02 -0400
message:
Add test that annotate correctly handles renames
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.1.1.1.35.1.2
revision-id:aaron at aaronbentley.com-20080702190910-7w7wdf65q5c0aq5l
parent: aaron at aaronbentley.com-20080702132617-1cyta13a4jct7qba
parent: aaron at aaronbentley.com-20080702190843-w24oilmtkvxh6aoa
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Wed 2008-07-02 15:09:10 -0400
message:
Merge with path_content_summary
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.32.1.3
revision-id:aaron at aaronbentley.com-20080702190843-w24oilmtkvxh6aoa
parent: aaron at aaronbentley.com-20080702132544-8vj2xfywjommuuj8
parent: aaron at aaronbentley.com-20080702190234-uvxeb5lpf5lvsgk8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-07-02 15:08:43 -0400
message:
Merge with preview-tree-changed
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.25.1.4
revision-id:aaron at aaronbentley.com-20080702190234-uvxeb5lpf5lvsgk8
parent: aaron at aaronbentley.com-20080702132408-2xqeebwr3ufylnw3
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Wed 2008-07-02 15:02:34 -0400
message:
Fix iteration order of iter_entries_by_dir
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.38
revision-id:aaron at aaronbentley.com-20080702132722-xoxdhvdlo2eg0q4a
parent: aaron at aaronbentley.com-20080626203414-1e01i0ezx7sq5gzh
parent: aaron at aaronbentley.com-20080702132659-ofq4dotjwmhachh1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: is_executable
timestamp: Wed 2008-07-02 09:27:22 -0400
message:
Merge with stored_kind
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-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/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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
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_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.36.1.1
revision-id:aaron at aaronbentley.com-20080702132659-ofq4dotjwmhachh1
parent: aaron at aaronbentley.com-20080626200740-4nfdd1s3dx01v06t
parent: aaron at aaronbentley.com-20080702132617-1cyta13a4jct7qba
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: stored_kind
timestamp: Wed 2008-07-02 09:26:59 -0400
message:
Merge with annotate
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-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/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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
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_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.35.1.1
revision-id:aaron at aaronbentley.com-20080702132617-1cyta13a4jct7qba
parent: aaron at aaronbentley.com-20080626193641-lle6e4f6hnsuvoxh
parent: aaron at aaronbentley.com-20080702132544-8vj2xfywjommuuj8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Wed 2008-07-02 09:26:17 -0400
message:
Merge with path_content_summary
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-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/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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
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_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.32.1.2
revision-id:aaron at aaronbentley.com-20080702132544-8vj2xfywjommuuj8
parent: aaron at aaronbentley.com-20080626173010-sqb7mp0xqjsbvrts
parent: aaron at aaronbentley.com-20080702132408-2xqeebwr3ufylnw3
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-07-02 09:25:44 -0400
message:
Merge with preview-tree-changed
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-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/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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
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_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.25.1.3
revision-id:aaron at aaronbentley.com-20080702132408-2xqeebwr3ufylnw3
parent: aaron at aaronbentley.com-20080626172235-dpuh2r04ljedg2vk
parent: pqm at pqm.ubuntu.com-20080701042123-zcmqzb7o6znwjx34
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Wed 2008-07-02 09:24:08 -0400
message:
Merge with bzr.dev
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
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-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/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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
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_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.37
revision-id:aaron at aaronbentley.com-20080626203414-1e01i0ezx7sq5gzh
parent: aaron at aaronbentley.com-20080626200740-4nfdd1s3dx01v06t
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: is_executable
timestamp: Thu 2008-06-26 16:34:14 -0400
message:
Fix is_executable
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.36
revision-id:aaron at aaronbentley.com-20080626200740-4nfdd1s3dx01v06t
parent: aaron at aaronbentley.com-20080626193641-lle6e4f6hnsuvoxh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Thu 2008-06-26 16:07:40 -0400
message:
Fix PreviewTree.stored_kind
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.35
revision-id:aaron at aaronbentley.com-20080626193641-lle6e4f6hnsuvoxh
parent: aaron at aaronbentley.com-20080626173106-6b2v5k6xb1xszgc5
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Thu 2008-06-26 15:36:41 -0400
message:
Update to get tests passing
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.34
revision-id:aaron at aaronbentley.com-20080626173106-6b2v5k6xb1xszgc5
parent: aaron at aaronbentley.com-20080626155510-2thr81gbu1hlezuv
parent: aaron at aaronbentley.com-20080626173010-sqb7mp0xqjsbvrts
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Thu 2008-06-26 13:31:06 -0400
message:
Merge with path_content_summary
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.32.1.1
revision-id:aaron at aaronbentley.com-20080626173010-sqb7mp0xqjsbvrts
parent: aaron at aaronbentley.com-20080625215311-23t7nryril2y99zs
parent: aaron at aaronbentley.com-20080626172235-dpuh2r04ljedg2vk
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Thu 2008-06-26 13:30:10 -0400
message:
Merge with preview-tree-changed
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.25.1.2
revision-id:aaron at aaronbentley.com-20080626172235-dpuh2r04ljedg2vk
parent: aaron at aaronbentley.com-20080625215133-ppug7y06ulmjrd9v
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Thu 2008-06-26 13:22:35 -0400
message:
Massive simplification of path2id
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.33
revision-id:aaron at aaronbentley.com-20080626155510-2thr81gbu1hlezuv
parent: aaron at aaronbentley.com-20080625215311-23t7nryril2y99zs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: annotate
timestamp: Thu 2008-06-26 11:55:10 -0400
message:
Implement PreviewTree.annotate_iter
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.32
revision-id:aaron at aaronbentley.com-20080625215311-23t7nryril2y99zs
parent: aaron at aaronbentley.com-20080625204631-1xqay9ump68bp40p
parent: aaron at aaronbentley.com-20080625215133-ppug7y06ulmjrd9v
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 17:53:11 -0400
message:
Merge with preview-tree-changed
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.25.1.1
revision-id:aaron at aaronbentley.com-20080625215133-ppug7y06ulmjrd9v
parent: aaron at aaronbentley.com-20080624195553-9q1pboo9aduba0w4
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Wed 2008-06-25 17:51:33 -0400
message:
Use final path, not tree path for trans_ids.
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.31
revision-id:aaron at aaronbentley.com-20080625204631-1xqay9ump68bp40p
parent: aaron at aaronbentley.com-20080625204313-orbfb4sbrw4pdrcx
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 16:46:31 -0400
message:
Tweak tests
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.1.1.1.30
revision-id:aaron at aaronbentley.com-20080625204313-orbfb4sbrw4pdrcx
parent: aaron at aaronbentley.com-20080625201957-wz1cy2lhu1wz4uez
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 16:43:13 -0400
message:
Improve execute bit testing
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.1.1.1.29
revision-id:aaron at aaronbentley.com-20080625201957-wz1cy2lhu1wz4uez
parent: aaron at aaronbentley.com-20080625201539-r5kt897k4uoidfs8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 16:19:57 -0400
message:
Remove unneeded changes
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.28
revision-id:aaron at aaronbentley.com-20080625201539-r5kt897k4uoidfs8
parent: aaron at aaronbentley.com-20080625200313-ok8qgk4tbkqopx1f
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 16:15:39 -0400
message:
Fix path_content_summary spelling
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.27
revision-id:aaron at aaronbentley.com-20080625200313-ok8qgk4tbkqopx1f
parent: aaron at aaronbentley.com-20080625175119-xgp3ayyabs1hubt7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 16:03:13 -0400
message:
Make path_content_summary a core API
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.26
revision-id:aaron at aaronbentley.com-20080625175119-xgp3ayyabs1hubt7
parent: aaron at aaronbentley.com-20080624195553-9q1pboo9aduba0w4
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: path_content_summary
timestamp: Wed 2008-06-25 13:51:19 -0400
message:
Get symlinks working
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.25
revision-id:aaron at aaronbentley.com-20080624195553-9q1pboo9aduba0w4
parent: aaron at aaronbentley.com-20080624191414-4zatcf7n3op4qjxk
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Tue 2008-06-24 15:55:53 -0400
message:
More removals of post-tree support
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.24
revision-id:aaron at aaronbentley.com-20080624191414-4zatcf7n3op4qjxk
parent: aaron at aaronbentley.com-20080624185458-3s6ejdmvb02xtg57
parent: aaron at aaronbentley.com-20080624191346-01aackxpcq31gh3e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Tue 2008-06-24 15:14:14 -0400
message:
Merge with fix-transform
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.16.1.1
revision-id:aaron at aaronbentley.com-20080624191346-01aackxpcq31gh3e
parent: aaron at aaronbentley.com-20080623173154-cv3p5ta640kq855v
parent: pqm at pqm.ubuntu.com-20080624011313-cq85foncf9mozmen
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fix-transform
timestamp: Tue 2008-06-24 15:13:46 -0400
message:
Merge with bzr.dev
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.1.1.1.23
revision-id:aaron at aaronbentley.com-20080624185458-3s6ejdmvb02xtg57
parent: aaron at aaronbentley.com-20080624180313-4u714c59br6z4lt6
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Tue 2008-06-24 14:54:58 -0400
message:
Fix iter_entries_by_dir ordering
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.22
revision-id:aaron at aaronbentley.com-20080624180313-4u714c59br6z4lt6
parent: aaron at aaronbentley.com-20080624175124-bl1778a0ieuyhsrr
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Tue 2008-06-24 14:03:13 -0400
message:
Remove PreviewTreePost scenarios
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.21
revision-id:aaron at aaronbentley.com-20080624175124-bl1778a0ieuyhsrr
parent: aaron at aaronbentley.com-20080624145042-jqvq17asm73jtour
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Tue 2008-06-24 13:51:24 -0400
message:
Implement iter_entries_by_dir
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.20
revision-id:aaron at aaronbentley.com-20080624145042-jqvq17asm73jtour
parent: aaron at aaronbentley.com-20080623215137-pfrpuxvmaj0bnh3d
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Tue 2008-06-24 10:50:42 -0400
message:
Split path2id into smaller pieces
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.19
revision-id:aaron at aaronbentley.com-20080623215137-pfrpuxvmaj0bnh3d
parent: aaron at aaronbentley.com-20080623193036-isux0uyxc69ufids
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-06-23 17:51:37 -0400
message:
Make PreviewTree.path2id correct
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.18
revision-id:aaron at aaronbentley.com-20080623193036-isux0uyxc69ufids
parent: aaron at aaronbentley.com-20080623173608-y7dwcvnpxe48cugh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-06-23 15:30:36 -0400
message:
Implement correct all_file_ids for PreviewTree
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.17
revision-id:aaron at aaronbentley.com-20080623173608-y7dwcvnpxe48cugh
parent: aaron at aaronbentley.com-20080623173154-cv3p5ta640kq855v
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-06-23 13:36:08 -0400
message:
Start implementing post-change PreviewTree functionality
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.16
revision-id:aaron at aaronbentley.com-20080623173154-cv3p5ta640kq855v
parent: aaron at aaronbentley.com-20080623152246-vx2embzwo31bcg2z
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fix-transform
timestamp: Mon 2008-06-23 13:31:54 -0400
message:
Fix root directory creation
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.15
revision-id:aaron at aaronbentley.com-20080623152246-vx2embzwo31bcg2z
parent: aaron at aaronbentley.com-20080428214716-cqzsgta289ik5my0
parent: pqm at pqm.ubuntu.com-20080620010918-64z4xylh1ap5hgyf
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-06-23 11:22:46 -0400
message:
Merge with bzr.dev
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/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/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/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/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/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
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_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/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/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
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/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
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/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
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_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_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_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_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/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/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/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/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: 3363.1.1.1.14
revision-id:aaron at aaronbentley.com-20080428214716-cqzsgta289ik5my0
parent: aaron at aaronbentley.com-20080428192550-xwg6uo64xch4jxs8
parent: pqm at pqm.ubuntu.com-20080428205328-bvr1g467xfx7rz9w
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-04-28 17:47:16 -0400
message:
Merge bzr.dev
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3363.1.1.1.13
revision-id:aaron at aaronbentley.com-20080428192550-xwg6uo64xch4jxs8
parent: aaron at aaronbentley.com-20080428192444-qalf6fl4e7ck51e2
parent: aaron at aaronbentley.com-20080428185055-642va5h5n13j8mxw
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-04-28 15:25:50 -0400
message:
Fake merge of preview-tree, to fix revert
------------------------------------------------------------
revno: 3363.1.1.1.12
revision-id:aaron at aaronbentley.com-20080428192444-qalf6fl4e7ck51e2
parent: aaron at aaronbentley.com-20080428030701-5axl03chky7p1qg9
parent: aaron at aaronbentley.com-20080428163729-vj9c0vf7rqkliani
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Mon 2008-04-28 15:24:44 -0400
message:
Merge from preview-tree
modified:
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2008-06-06 16:36:15 +0000
+++ b/bzrlib/tests/test_transform.py 2008-07-02 19:18:03 +0000
@@ -2031,3 +2031,271 @@
preview_tree = preview.get_preview_tree()
self.assertEqual('target',
preview_tree.get_symlink_target('symlink-id'))
+
+ def test_all_file_ids(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/a', 'tree/b', 'tree/c'])
+ tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ preview.unversion_file(preview.trans_id_file_id('b-id'))
+ c_trans_id = preview.trans_id_file_id('c-id')
+ preview.unversion_file(c_trans_id)
+ preview.version_file('c-id', c_trans_id)
+ preview_tree = preview.get_preview_tree()
+ self.assertEqual(set(['a-id', 'c-id', tree.get_root_id()]),
+ preview_tree.all_file_ids())
+
+ def test_path2id_deleted_unchanged(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/unchanged', 'tree/deleted'])
+ tree.add(['unchanged', 'deleted'], ['unchanged-id', 'deleted-id'])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ preview.unversion_file(preview.trans_id_file_id('deleted-id'))
+ preview_tree = preview.get_preview_tree()
+ self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
+ self.assertIs(None, preview_tree.path2id('deleted'))
+
+ def test_path2id_created(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/unchanged'])
+ tree.add(['unchanged'], ['unchanged-id'])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ preview.new_file('new', preview.trans_id_file_id('unchanged-id'),
+ 'contents', 'new-id')
+ preview_tree = preview.get_preview_tree()
+ self.assertEqual('new-id', preview_tree.path2id('unchanged/new'))
+
+ def test_path2id_moved(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/old_parent/', 'tree/old_parent/child'])
+ tree.add(['old_parent', 'old_parent/child'],
+ ['old_parent-id', 'child-id'])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ new_parent = preview.new_directory('new_parent', preview.root,
+ 'new_parent-id')
+ preview.adjust_path('child', new_parent,
+ preview.trans_id_file_id('child-id'))
+ preview_tree = preview.get_preview_tree()
+ self.assertIs(None, preview_tree.path2id('old_parent/child'))
+ self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
+
+ def test_path2id_renamed_parent(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/old_name/', 'tree/old_name/child'])
+ tree.add(['old_name', 'old_name/child'],
+ ['parent-id', 'child-id'])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ preview.adjust_path('new_name', preview.root,
+ preview.trans_id_file_id('parent-id'))
+ preview_tree = preview.get_preview_tree()
+ self.assertIs(None, preview_tree.path2id('old_name/child'))
+ self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
+
+ def assertMatchingIterEntries(self, tt, specific_file_ids=None):
+ preview_tree = tt.get_preview_tree()
+ preview_result = list(preview_tree.iter_entries_by_dir(
+ specific_file_ids))
+ tree = tt._tree
+ tt.apply()
+ actual_result = list(tree.iter_entries_by_dir(specific_file_ids))
+ self.assertEqual(actual_result, preview_result)
+
+ def test_iter_entries_by_dir_new(self):
+ tree = self.make_branch_and_tree('tree')
+ tt = TreeTransform(tree)
+ tt.new_file('new', tt.root, 'contents', 'new-id')
+ self.assertMatchingIterEntries(tt)
+
+ def test_iter_entries_by_dir_deleted(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/deleted'])
+ tree.add('deleted', 'deleted-id')
+ tt = TreeTransform(tree)
+ tt.delete_contents(tt.trans_id_file_id('deleted-id'))
+ self.assertMatchingIterEntries(tt)
+
+ def test_iter_entries_by_dir_unversioned(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/removed'])
+ tree.add('removed', 'removed-id')
+ tt = TreeTransform(tree)
+ tt.unversion_file(tt.trans_id_file_id('removed-id'))
+ self.assertMatchingIterEntries(tt)
+
+ def test_iter_entries_by_dir_moved(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/moved', 'tree/new_parent/'])
+ tree.add(['moved', 'new_parent'], ['moved-id', 'new_parent-id'])
+ tt = TreeTransform(tree)
+ tt.adjust_path('moved', tt.trans_id_file_id('new_parent-id'),
+ tt.trans_id_file_id('moved-id'))
+ self.assertMatchingIterEntries(tt)
+
+ def test_iter_entries_by_dir_specific_file_ids(self):
+ tree = self.make_branch_and_tree('tree')
+ tree.set_root_id('tree-root-id')
+ self.build_tree(['tree/parent/', 'tree/parent/child'])
+ tree.add(['parent', 'parent/child'], ['parent-id', 'child-id'])
+ tt = TreeTransform(tree)
+ self.assertMatchingIterEntries(tt, ['tree-root-id', 'child-id'])
+
+ def test_symlink_content_summary(self):
+ self.requireFeature(SymlinkFeature)
+ preview = self.get_empty_preview()
+ preview.new_symlink('path', preview.root, 'target', 'path-id')
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(('symlink', None, None, 'target'), summary)
+
+ def test_missing_content_summary(self):
+ preview = self.get_empty_preview()
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(('missing', None, None, None), summary)
+
+ def test_deleted_content_summary(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/path/'])
+ tree.add('path')
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ preview.delete_contents(preview.trans_id_tree_path('path'))
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(('missing', None, None, None), summary)
+
+ def test_file_content_summary_executable(self):
+ if not osutils.supports_executable():
+ raise TestNotApplicable()
+ preview = self.get_empty_preview()
+ path_id = preview.new_file('path', preview.root, 'contents', 'path-id')
+ preview.set_executability(True, path_id)
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(4, len(summary))
+ self.assertEqual('file', summary[0])
+ # size must be known
+ self.assertEqual(len('contents'), summary[1])
+ # executable
+ self.assertEqual(True, summary[2])
+ # will not have hash (not cheap to determine)
+ self.assertIs(None, summary[3])
+
+ def test_change_executability(self):
+ if not osutils.supports_executable():
+ raise TestNotApplicable()
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/path'])
+ tree.add('path')
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ path_id = preview.trans_id_tree_path('path')
+ preview.set_executability(True, path_id)
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(True, summary[2])
+
+ def test_file_content_summary_non_exec(self):
+ preview = self.get_empty_preview()
+ preview.new_file('path', preview.root, 'contents', 'path-id')
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(4, len(summary))
+ self.assertEqual('file', summary[0])
+ # size must be known
+ self.assertEqual(len('contents'), summary[1])
+ # not executable
+ if osutils.supports_executable():
+ self.assertEqual(False, summary[2])
+ else:
+ self.assertEqual(None, summary[2])
+ # will not have hash (not cheap to determine)
+ self.assertIs(None, summary[3])
+
+ def test_dir_content_summary(self):
+ preview = self.get_empty_preview()
+ preview.new_directory('path', preview.root, 'path-id')
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(('directory', None, None, None), summary)
+
+ def test_tree_content_summary(self):
+ preview = self.get_empty_preview()
+ path = preview.new_directory('path', preview.root, 'path-id')
+ preview.set_tree_reference('rev-1', path)
+ summary = preview.get_preview_tree().path_content_summary('path')
+ self.assertEqual(4, len(summary))
+ self.assertEqual('tree-reference', summary[0])
+
+ def test_annotate(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree_contents([('tree/file', 'a\n')])
+ tree.add('file', 'file-id')
+ tree.commit('a', rev_id='one')
+ self.build_tree_contents([('tree/file', 'a\nb\n')])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ file_trans_id = preview.trans_id_file_id('file-id')
+ preview.delete_contents(file_trans_id)
+ preview.create_file('a\nb\nc\n', file_trans_id)
+ preview_tree = preview.get_preview_tree()
+ expected = [
+ ('one', 'a\n'),
+ ('me:', 'b\n'),
+ ('me:', 'c\n'),
+ ]
+ annotation = preview_tree.annotate_iter('file-id', 'me:')
+ self.assertEqual(expected, annotation)
+
+ def test_annotate_missing(self):
+ preview = self.get_empty_preview()
+ preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
+ preview_tree = preview.get_preview_tree()
+ expected = [
+ ('me:', 'a\n'),
+ ('me:', 'b\n'),
+ ('me:', 'c\n'),
+ ]
+ annotation = preview_tree.annotate_iter('file-id', 'me:')
+ self.assertEqual(expected, annotation)
+
+ def test_annotate_rename(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree_contents([('tree/file', 'a\n')])
+ tree.add('file', 'file-id')
+ tree.commit('a', rev_id='one')
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ file_trans_id = preview.trans_id_file_id('file-id')
+ preview.adjust_path('newname', preview.root, file_trans_id)
+ preview_tree = preview.get_preview_tree()
+ expected = [
+ ('one', 'a\n'),
+ ]
+ annotation = preview_tree.annotate_iter('file-id', 'me:')
+ self.assertEqual(expected, annotation)
+
+ def test_annotate_deleted(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree_contents([('tree/file', 'a\n')])
+ tree.add('file', 'file-id')
+ tree.commit('a', rev_id='one')
+ self.build_tree_contents([('tree/file', 'a\nb\n')])
+ preview = TransformPreview(tree)
+ self.addCleanup(preview.finalize)
+ file_trans_id = preview.trans_id_file_id('file-id')
+ preview.delete_contents(file_trans_id)
+ preview_tree = preview.get_preview_tree()
+ annotation = preview_tree.annotate_iter('file-id', 'me:')
+ self.assertIs(None, annotation)
+
+ def test_stored_kind(self):
+ preview = self.get_empty_preview()
+ preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
+ preview_tree = preview.get_preview_tree()
+ self.assertEqual('file', preview_tree.stored_kind('file-id'))
+
+ def test_is_executable(self):
+ preview = self.get_empty_preview()
+ preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
+ preview.set_executability(True, preview.trans_id_file_id('file-id'))
+ preview_tree = preview.get_preview_tree()
+ self.assertEqual(True, preview_tree.is_executable('file-id'))
=== modified file 'bzrlib/tests/tree_implementations/test_tree.py'
--- a/bzrlib/tests/tree_implementations/test_tree.py 2008-06-20 19:06:38 +0000
+++ b/bzrlib/tests/tree_implementations/test_tree.py 2008-07-02 19:02:34 +0000
@@ -191,3 +191,15 @@
work_tree = self.make_branch_and_tree('wt')
tree = self._convert_tree(work_tree)
self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
+
+
+class TestIterEntriesByDir(TestCaseWithTree):
+
+ def test_iteration_order(self):
+ work_tree = self.make_branch_and_tree('.')
+ self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
+ work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
+ tree = self._convert_tree(work_tree)
+ output_order = [p for p, e in tree.iter_entries_by_dir()]
+ self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
+ output_order)
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2008-06-08 20:34:15 +0000
+++ b/bzrlib/transform.py 2008-07-02 19:18:03 +0000
@@ -16,12 +16,13 @@
import os
import errno
-from stat import S_ISREG
+from stat import S_ISREG, S_IEXEC
import tempfile
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
from bzrlib import (
+ annotate,
bzrdir,
delta,
errors,
@@ -34,8 +35,15 @@
ExistingLimbo, ImmortalLimbo, NoFinalPath,
UnableCreateSymlink)
from bzrlib.inventory import InventoryEntry
-from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
- delete_any, has_symlinks)
+from bzrlib.osutils import (
+ delete_any,
+ file_kind,
+ has_symlinks,
+ lexists,
+ pathjoin,
+ splitpath,
+ supports_executable,
+)
from bzrlib.progress import DummyProgress, ProgressPhase
from bzrlib.symbol_versioning import (
deprecated_function,
@@ -1383,7 +1391,10 @@
except KeyError:
return
file_id = self.tree_file_id(parent_id)
- for child in self._tree.inventory[file_id].children.iterkeys():
+ if file_id is None:
+ return
+ children = getattr(self._tree.inventory[file_id], 'children', {})
+ for child in children:
childpath = joinpath(path, child)
yield self.trans_id_tree_path(childpath)
@@ -1394,6 +1405,7 @@
def __init__(self, transform):
self._transform = transform
self._final_paths = FinalPaths(transform)
+ self.__by_parent = None
def _changes(self, file_id):
for changes in self._transform.iter_changes():
@@ -1416,6 +1428,12 @@
name = self._transform._limbo_name(trans_id)
return os.lstat(name)
+ @property
+ def _by_parent(self):
+ if self.__by_parent is None:
+ self.__by_parent = self._transform.by_parent()
+ return self.__by_parent
+
def lock_read(self):
# Perhaps in theory, this should lock the TreeTransform?
pass
@@ -1432,7 +1450,11 @@
return self._transform.final_file_id(self._transform.root)
def all_file_ids(self):
- return self._transform._tree.all_file_ids()
+ tree_ids = set(self._transform._tree.all_file_ids())
+ tree_ids.difference_update(self._transform.tree_file_id(t)
+ for t in self._transform._removed_id)
+ tree_ids.update(self._transform._new_id.values())
+ return tree_ids
def __iter__(self):
return iter(self.all_file_ids())
@@ -1450,8 +1472,20 @@
trees=[], require_versioned=require_versioned))
return result
+ def _path2trans_id(self, path):
+ segments = splitpath(path)
+ cur_parent = self._transform.root
+ for cur_segment in segments:
+ for child in self._all_children(cur_parent):
+ if self._transform.final_name(child) == cur_segment:
+ cur_parent = child
+ break
+ else:
+ return None
+ return cur_parent
+
def path2id(self, path):
- return self._transform._tree.path2id(path)
+ return self._transform.final_file_id(self._path2trans_id(path))
def id2path(self, file_id):
trans_id = self._transform.trans_id_file_id(file_id)
@@ -1460,15 +1494,62 @@
except NoFinalPath:
raise errors.NoSuchId(self, file_id)
+ def _all_children(self, trans_id):
+ children = set(self._transform.iter_tree_children(trans_id))
+ # children in the _new_parent set are provided by _by_parent.
+ children.difference_update(self._transform._new_parent.keys())
+ children.update(self._by_parent.get(trans_id, []))
+ return children
+
+ def _make_inv_entries(self, ordered_entries, specific_file_ids):
+ for trans_id, parent_file_id in ordered_entries:
+ file_id = self._transform.final_file_id(trans_id)
+ if file_id is None:
+ continue
+ if (specific_file_ids is not None
+ and file_id not in specific_file_ids):
+ continue
+ try:
+ kind = self._transform.final_kind(trans_id)
+ except NoSuchFile:
+ kind = self._transform._tree.stored_kind(file_id)
+ new_entry = inventory.make_entry(
+ kind,
+ self._transform.final_name(trans_id),
+ parent_file_id, file_id)
+ yield new_entry, trans_id
+
def iter_entries_by_dir(self, specific_file_ids=None):
- return self._transform._tree.iter_entries_by_dir(specific_file_ids)
+ # This may not be a maximally efficient implementation, but it is
+ # reasonably straightforward. An implementation that grafts the
+ # TreeTransform changes onto the tree's iter_entries_by_dir results
+ # might be more efficient, but requires tricky inferences about stack
+ # position.
+ todo = [ROOT_PARENT]
+ ordered_ids = []
+ while len(todo) > 0:
+ parent = todo.pop()
+ parent_file_id = self._transform.final_file_id(parent)
+ children = list(self._all_children(parent))
+ paths = dict(zip(children, self._final_paths.get_paths(children)))
+ children.sort(key=paths.get)
+ todo.extend(reversed(children))
+ for trans_id in children:
+ ordered_ids.append((trans_id, parent_file_id))
+ for entry, trans_id in self._make_inv_entries(ordered_ids,
+ specific_file_ids):
+ yield unicode(self._final_paths.get_path(trans_id)), entry
def kind(self, file_id):
trans_id = self._transform.trans_id_file_id(file_id)
return self._transform.final_kind(trans_id)
def stored_kind(self, file_id):
- return self._transform._tree.stored_kind(file_id)
+ trans_id = self._transform.trans_id_file_id(file_id)
+ try:
+ return self._transform._new_contents[trans_id]
+ except KeyError:
+ return self._transform._tree.stored_kind(file_id)
def get_file_mtime(self, file_id, path=None):
"""See Tree.get_file_mtime"""
@@ -1487,10 +1568,42 @@
return self._transform._tree.get_file_sha1(file_id)
def is_executable(self, file_id, path=None):
- return self._transform._tree.is_executable(file_id, path)
+ trans_id = self._transform.trans_id_file_id(file_id)
+ try:
+ return self._transform._new_executability[trans_id]
+ except KeyError:
+ return self._transform._tree.is_executable(file_id, path)
def path_content_summary(self, path):
- return self._transform._tree.path_content_summary(path)
+ trans_id = self._path2trans_id(path)
+ tt = self._transform
+ tree_path = tt._tree_id_paths.get(trans_id)
+ kind = tt._new_contents.get(trans_id)
+ if kind is None:
+ if tree_path is None or trans_id in tt._removed_contents:
+ return 'missing', None, None, None
+ summary = tt._tree.path_content_summary(tree_path)
+ kind, size, executable, link_or_sha1 = summary
+ else:
+ link_or_sha1 = None
+ limbo_name = tt._limbo_name(trans_id)
+ if trans_id in tt._new_reference_revision:
+ kind = 'tree-reference'
+ if kind == 'file':
+ statval = os.lstat(limbo_name)
+ size = statval.st_size
+ if not supports_executable():
+ executable = None
+ else:
+ executable = statval.st_mode & S_IEXEC
+ else:
+ size = None
+ executable = None
+ if kind == 'symlink':
+ link_or_sha1 = os.readlink(limbo_name)
+ if supports_executable():
+ executable = tt._new_executability.get(trans_id, executable)
+ return kind, size, executable, link_or_sha1
def iter_changes(self, from_tree, include_unchanged=False,
specific_files=None, pb=None, extra_trees=None,
@@ -1528,8 +1641,27 @@
def annotate_iter(self, file_id,
default_revision=_mod_revision.CURRENT_REVISION):
- return self._transform._tree.annotate_iter(file_id,
- default_revision=default_revision)
+ changes = self._changes(file_id)
+ if changes is None:
+ get_old = True
+ else:
+ changed_content, versioned, kind = (changes[2], changes[3],
+ changes[6])
+ if kind[1] is None:
+ return None
+ get_old = (kind[0] == 'file' and versioned[0])
+ if get_old:
+ old_annotation = self._transform._tree.annotate_iter(file_id,
+ default_revision=default_revision)
+ else:
+ old_annotation = []
+ if changes is None:
+ return old_annotation
+ if not changed_content:
+ return old_annotation
+ return annotate.reannotate([old_annotation],
+ self.get_file(file_id).readlines(),
+ default_revision)
def get_symlink_target(self, file_id):
"""See Tree.get_symlink_target"""
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py 2008-07-02 01:40:02 +0000
+++ b/bzrlib/tree.py 2008-07-02 19:51:05 +0000
@@ -177,10 +177,26 @@
def iter_entries_by_dir(self, specific_file_ids=None):
"""Walk the tree in 'by_dir' order.
- This will yield each entry in the tree as a (path, entry) tuple. The
- order that they are yielded is: the contents of a directory are
- preceeded by the parent of a directory, and all the contents of a
- directory are grouped together.
+ This will yield each entry in the tree as a (path, entry) tuple.
+ The order that they are yielded is:
+
+ Directories are walked in a depth-first lexicographical order,
+ however, whenever a directory is reached, all of its direct child
+ nodes are yielded in lexicographical order before yielding the
+ grandchildren.
+
+ For example, in the tree::
+
+ a/
+ b/
+ c
+ d/
+ e
+ f/
+ g
+
+ The yield order (ignoring root) would be::
+ a, f, a/b, a/d, a/b/c, a/d/e, f/g
"""
return self.inventory.iter_entries_by_dir(
specific_file_ids=specific_file_ids)
More information about the bazaar-commits
mailing list