Rev 3752: Enable merging into PreviewTrees in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Tue Sep 30 00:51:48 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3752
revision-id: pqm at pqm.ubuntu.com-20080929235144-2jweo1007kh31723
parent: pqm at pqm.ubuntu.com-20080929084952-3d81d63rru8tt8mm
parent: aaron at aaronbentley.com-20080929184305-1ayhg56t6k943qd6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-30 00:51:44 +0100
message:
Enable merging into PreviewTrees
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
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
------------------------------------------------------------
revno: 3363.17.14
revision-id: aaron at aaronbentley.com-20080929184305-1ayhg56t6k943qd6
parent: aaron at aaronbentley.com-20080923051944-eufgfonvgktowyp7
parent: pqm at pqm.ubuntu.com-20080929054234-s2ajcaxxm75errlz
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Mon 2008-09-29 14:43:05 -0400
message:
Merge with bzr.dev
removed:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
added:
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py test_get_file_with_s-20080922035909-lhdovrr36jpxmu0v-1
doc/developers/lca_tree_merging.txt lca_merge_resolution-20080731173903-8ku77uz7o6smd3jj-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/_readdir_py.py readdir.py-20060609152855-rm6v321vuaqyh9tu-3
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-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/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/inventory.txt inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3363.17.13
revision-id: aaron at aaronbentley.com-20080923051944-eufgfonvgktowyp7
parent: aaron at aaronbentley.com-20080922185038-66w5n4vq8lsdhmi6
parent: aaron at aaronbentley.com-20080923045124-l0s8r6gbjpgmbz3r
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Tue 2008-09-23 01:19:44 -0400
message:
Merge with get_file_sha1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
------------------------------------------------------------
revno: 3363.15.9
revision-id: aaron at aaronbentley.com-20080923045124-l0s8r6gbjpgmbz3r
parent: aaron at aaronbentley.com-20080922185009-vhg2dq8zso5z840o
parent: aaron at aaronbentley.com-20080923044950-ocg2tp8d284x7o09
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: get_file_sha1
timestamp: Tue 2008-09-23 00:51:24 -0400
message:
Merge with __contains__
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
------------------------------------------------------------
revno: 3363.16.6
revision-id: aaron at aaronbentley.com-20080923044950-ocg2tp8d284x7o09
parent: aaron at aaronbentley.com-20080923044744-8jrov71kompyu9b5
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: __contains__
timestamp: Tue 2008-09-23 00:49:50 -0400
message:
Fix redundant test classes
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
------------------------------------------------------------
revno: 3363.16.5
revision-id: aaron at aaronbentley.com-20080923044744-8jrov71kompyu9b5
parent: aaron at aaronbentley.com-20080922184951-xatxbhvv1i29i8gr
parent: aaron at aaronbentley.com-20080923044449-b9gf8xr2n02xtdlh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: __contains__
timestamp: Tue 2008-09-23 00:47:44 -0400
message:
Merge with intertree
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3363.17.12
revision-id: aaron at aaronbentley.com-20080922185038-66w5n4vq8lsdhmi6
parent: aaron at aaronbentley.com-20080920172157-bkbgz82zbqqh3lw5
parent: aaron at aaronbentley.com-20080922185009-vhg2dq8zso5z840o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Mon 2008-09-22 14:50:38 -0400
message:
Merge with get_file_sha1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_remove_tree.py test_remove_tree.py-20061110192919-5j3xjciiaqbs2dvo-1
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3363.17.11
revision-id: aaron at aaronbentley.com-20080920172157-bkbgz82zbqqh3lw5
parent: aaron at aaronbentley.com-20080909205815-aqkaw6gl5fy9kr5f
parent: aaron at aaronbentley.com-20080920172138-gdf7bnybkc6wnz9s
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Sat 2008-09-20 13:21:57 -0400
message:
Merge with get_file_sha1
renamed:
bzrlib/tests/repository_implementations => bzrlib/tests/per_repository repository_implementations-20060131092037-ec97814745cc6128
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/per_repository/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_break_lock.py test_break_lock.py-20060504111704-ee09a107f9f42e43
bzrlib/tests/per_repository/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/per_repository/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/per_repository/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/per_repository/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
bzrlib/tests/per_repository/test_get_parent_map.py test_get_parent_map.-20080421172708-x1z6ot341osr0jq1-1
bzrlib/tests/per_repository/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
bzrlib/tests/per_repository/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/per_repository/test_is_write_locked.py test_is_write_locked-20071012063748-vk062lmu683qgbc3-1
bzrlib/tests/per_repository/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/per_repository/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/per_repository/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/per_repository/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
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_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
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/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
profile_imports.py profile_imports.py-20060618020306-k5uw80achysrokj9-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
------------------------------------------------------------
revno: 3363.17.10
revision-id: aaron at aaronbentley.com-20080909205815-aqkaw6gl5fy9kr5f
parent: aaron at aaronbentley.com-20080908204453-sbdu3fnbgvwwsgq6
parent: aaron at aaronbentley.com-20080909205758-ww1zyvi2lbnq8wm3
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Tue 2008-09-09 16:58:15 -0400
message:
Merge with get_files_sha1
modified:
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.17.9
revision-id: aaron at aaronbentley.com-20080908204453-sbdu3fnbgvwwsgq6
parent: aaron at aaronbentley.com-20080801054136-c43vhko3syb91dfr
parent: aaron at aaronbentley.com-20080908204346-wi4fwu62qb6uobht
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Mon 2008-09-08 16:44:53 -0400
message:
merge with get_file_sha1
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
added:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/_readdir_py.py readdir.py-20060609152855-rm6v321vuaqyh9tu-3
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/readdir.h readdir.h-20060609152855-rm6v321vuaqyh9tu-2
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_transport_log.py test_transport_log.p-20080902041816-vh8x5yt5nvdzvew3-3
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
bzrlib/transport/ftp/ ftp-20080611185801-3vm145h8dmnfgh25-1
bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
bzrlib/transport/log.py log.py-20080902041816-vh8x5yt5nvdzvew3-5
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
doc/developers/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
tools/packaging/ packaging-20080825202834-3j433iaawnt72wqa-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
renamed:
bzrlib/transport/ftp.py => bzrlib/transport/ftp/__init__.py ftp.py-20051116161804-58dc9506548c2a53
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/atomicfile.py atomicfile.py-20050509044450-dbd24e6c564f7c66
bzrlib/benchmarks/bench_osutils.py bench_osutils.py-20060608153714-apso8cyz1bu2z1ig-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-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/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_cat_revision.py test_cat_revision.py-20070410204634-fq8mnld5l5aza9e2-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
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_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
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_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
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_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3363.17.8
revision-id: aaron at aaronbentley.com-20080801054136-c43vhko3syb91dfr
parent: aaron at aaronbentley.com-20080801053938-2ug9i0fcsofrbamb
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 17:41:36 +1200
message:
Get merge into a preview tree working
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 3363.17.7
revision-id: aaron at aaronbentley.com-20080801053938-2ug9i0fcsofrbamb
parent: aaron at aaronbentley.com-20080801052528-zopgxgje2p60ynat
parent: aaron at aaronbentley.com-20080801053908-mpfbe4lfuymsd7mg
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 17:39:38 +1200
message:
Merge from get_file_sha1
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.17.6
revision-id: aaron at aaronbentley.com-20080801052528-zopgxgje2p60ynat
parent: aaron at aaronbentley.com-20080801051027-pxdrrmxv18aa280u
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 17:25:28 +1200
message:
Improve test scenario
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.17.5
revision-id: aaron at aaronbentley.com-20080801051027-pxdrrmxv18aa280u
parent: aaron at aaronbentley.com-20080801045601-brkznwldpvfuzwxc
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 17:10:27 +1200
message:
Update merge to not use inventory
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.17.4
revision-id: aaron at aaronbentley.com-20080801045601-brkznwldpvfuzwxc
parent: aaron at aaronbentley.com-20080801044015-evl1fcd366ro879a
parent: aaron at aaronbentley.com-20080801045510-bkud24q1syjvmk00
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 16:56:01 +1200
message:
Merge with __contains__
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.17.3
revision-id: aaron at aaronbentley.com-20080801044015-evl1fcd366ro879a
parent: aaron at aaronbentley.com-20080801042945-13iii343abtkpyxt
parent: aaron at aaronbentley.com-20080801043704-gfr3sjfkc0e9b39i
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 16:40:15 +1200
message:
Merge with has_id
modified:
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
------------------------------------------------------------
revno: 3363.17.2
revision-id: aaron at aaronbentley.com-20080801042945-13iii343abtkpyxt
parent: aaron at aaronbentley.com-20080801041340-zz8d7rjll6yywpm9
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 16:29:45 +1200
message:
Add text checking
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.17.1
revision-id: aaron at aaronbentley.com-20080801041340-zz8d7rjll6yywpm9
parent: aaron at aaronbentley.com-20080731045146-fhfu8aywmwvusmp7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: merge-into
timestamp: Fri 2008-08-01 16:13:40 +1200
message:
Avoid inventory for merge and transform code
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py 2008-09-24 12:53:22 +0000
+++ b/bzrlib/merge.py 2008-09-29 18:43:05 +0000
@@ -172,7 +172,8 @@
@staticmethod
def from_revision_ids(pb, tree, other, base=None, other_branch=None,
- base_branch=None, revision_graph=None):
+ base_branch=None, revision_graph=None,
+ tree_branch=None):
"""Return a Merger for revision-ids.
:param tree: The tree to merge changes into
@@ -187,7 +188,9 @@
it in, otherwise it will be created for you.
:param pb: A progress indicator
"""
- merger = Merger(tree.branch, this_tree=tree, pb=pb,
+ if tree_branch is None:
+ tree_branch = tree.branch
+ merger = Merger(tree_branch, this_tree=tree, pb=pb,
revision_graph=revision_graph)
if other_branch is None:
other_branch = tree.branch
@@ -668,13 +671,16 @@
iterator = self.other_tree.iter_changes(self.base_tree,
include_unchanged=True, specific_files=self.interesting_files,
extra_trees=[self.this_tree])
+ this_entries = dict((e.file_id, e) for p, e in
+ self.this_tree.iter_entries_by_dir(
+ self.interesting_ids))
for (file_id, paths, changed, versioned, parents, names, kind,
executable) in iterator:
if (self.interesting_ids is not None and
file_id not in self.interesting_ids):
continue
- if file_id in self.this_tree.inventory:
- entry = self.this_tree.inventory[file_id]
+ entry = this_entries.get(file_id)
+ if entry is not None:
this_name = entry.name
this_parent = entry.parent_id
this_executable = entry.executable
@@ -1125,10 +1131,10 @@
self.tt.delete_contents(trans_id)
if file_id in self.other_tree:
# OTHER changed the file
- create_by_entry(self.tt,
- self.other_tree.inventory[file_id],
+ create_by_entry(self.tt,
+ self.other_tree.inventory[file_id],
self.other_tree, trans_id)
- if file_id not in self.this_tree.inventory:
+ if file_id not in self.this_tree:
self.tt.version_file(file_id, trans_id)
return "modified"
elif file_id in self.this_tree.inventory:
@@ -1144,7 +1150,7 @@
self.text_merge(file_id, trans_id)
except BinaryFile:
return contents_conflict()
- if file_id not in self.this_tree.inventory:
+ if file_id not in self.this_tree:
self.tt.version_file(file_id, trans_id)
try:
self.tt.tree_kind(trans_id)
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2008-09-22 18:05:12 +0000
+++ b/bzrlib/tests/test_transform.py 2008-09-22 18:50:38 +0000
@@ -40,7 +40,7 @@
ExistingPendingDeletion, ImmortalLimbo,
ImmortalPendingDeletion, LockError)
from bzrlib.osutils import file_kind, pathjoin
-from bzrlib.merge import Merge3Merger
+from bzrlib.merge import Merge3Merger, Merger
from bzrlib.tests import (
CaseInsensitiveFilesystemFeature,
HardlinkFeature,
@@ -2468,3 +2468,32 @@
preview.unversion_file(preview.trans_id_tree_path('removed-file'))
self.assertEqual(set(['new-file', 'removed-file', 'existing-file']),
set(tree.extras()))
+
+ def test_merge_into_preview(self):
+ work_tree = self.make_branch_and_tree('tree')
+ self.build_tree_contents([('tree/file','b\n')])
+ work_tree.add('file', 'file-id')
+ work_tree.commit('first commit')
+ child_tree = work_tree.bzrdir.sprout('child').open_workingtree()
+ self.build_tree_contents([('child/file','b\nc\n')])
+ child_tree.commit('child commit')
+ child_tree.lock_write()
+ self.addCleanup(child_tree.unlock)
+ work_tree.lock_write()
+ self.addCleanup(work_tree.unlock)
+ preview = TransformPreview(work_tree)
+ self.addCleanup(preview.finalize)
+ preview_tree = preview.get_preview_tree()
+ file_trans_id = preview.trans_id_file_id('file-id')
+ preview.delete_contents(file_trans_id)
+ preview.create_file('a\nb\n', file_trans_id)
+ pb = progress.DummyProgress()
+ merger = Merger.from_revision_ids(pb, preview_tree,
+ child_tree.branch.last_revision(),
+ other_branch=child_tree.branch,
+ tree_branch=work_tree.branch)
+ merger.merge_type = Merge3Merger
+ tt = merger.make_merger().make_preview_transform()
+ self.addCleanup(tt.finalize)
+ final_tree = tt.get_preview_tree()
+ self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
=== modified file 'bzrlib/tests/tree_implementations/test_tree.py'
--- a/bzrlib/tests/tree_implementations/test_tree.py 2008-09-08 20:43:46 +0000
+++ b/bzrlib/tests/tree_implementations/test_tree.py 2008-09-23 05:19:44 +0000
@@ -220,6 +220,16 @@
self.assertTrue(tree.has_id('file-id'))
self.assertFalse(tree.has_id('dir-id'))
+ def test___contains__(self):
+ work_tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/file'])
+ work_tree.add('file', 'file-id')
+ tree = self._convert_tree(work_tree)
+ tree.lock_read()
+ self.addCleanup(tree.unlock)
+ self.assertTrue('file-id' in tree)
+ self.assertFalse('dir-id' in tree)
+
class TestExtras(TestCaseWithTree):
@@ -240,28 +250,6 @@
self.addCleanup(tree.unlock)
self.assertEqual(expected, list(tree.extras()))
-class TestHasId(TestCaseWithTree):
-
- def test_has_id(self):
- work_tree = self.make_branch_and_tree('tree')
- self.build_tree(['tree/file'])
- work_tree.add('file', 'file-id')
- tree = self._convert_tree(work_tree)
- tree.lock_read()
- self.addCleanup(tree.unlock)
- self.assertTrue(tree.has_id('file-id'))
- self.assertFalse(tree.has_id('dir-id'))
-
- def test___contains__(self):
- work_tree = self.make_branch_and_tree('tree')
- self.build_tree(['tree/file'])
- work_tree.add('file', 'file-id')
- tree = self._convert_tree(work_tree)
- tree.lock_read()
- self.addCleanup(tree.unlock)
- self.assertTrue('file-id' in tree)
- self.assertFalse('dir-id' in tree)
-
class TestGetFileSha1(TestCaseWithTree):
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2008-09-08 20:43:46 +0000
+++ b/bzrlib/transform.py 2008-09-08 20:44:53 +0000
@@ -281,14 +281,18 @@
raise ValueError('None is not a valid file id')
if file_id in self._r_new_id and self._r_new_id[file_id] is not None:
return self._r_new_id[file_id]
- elif file_id in self._tree.inventory:
- return self.trans_id_tree_file_id(file_id)
- elif file_id in self._non_present_ids:
- return self._non_present_ids[file_id]
else:
- trans_id = self._assign_id()
- self._non_present_ids[file_id] = trans_id
- return trans_id
+ try:
+ self._tree.iter_entries_by_dir([file_id]).next()
+ except StopIteration:
+ if file_id in self._non_present_ids:
+ return self._non_present_ids[file_id]
+ else:
+ trans_id = self._assign_id()
+ self._non_present_ids[file_id] = trans_id
+ return trans_id
+ else:
+ return self.trans_id_tree_file_id(file_id)
def canonical_path(self, path):
"""Get the canonical tree-relative path"""
@@ -550,7 +554,7 @@
# the file is old; the old id is still valid
if self._new_root == trans_id:
return self._tree.get_root_id()
- return self._tree.inventory.path2id(path)
+ return self._tree.path2id(path)
def final_file_id(self, trans_id):
"""Determine the file id after any changes are applied, or None.
@@ -1007,7 +1011,7 @@
from_path = self._tree_id_paths.get(from_trans_id)
if from_versioned:
# get data from working tree if versioned
- from_entry = self._tree.inventory[file_id]
+ from_entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
from_name = from_entry.name
from_parent = from_entry.parent_id
else:
@@ -1439,7 +1443,8 @@
file_id = self.tree_file_id(parent_id)
if file_id is None:
return
- children = getattr(self._tree.inventory[file_id], 'children', {})
+ entry = self._tree.iter_entries_by_dir([file_id]).next()[1]
+ children = getattr(entry, 'children', {})
for child in children:
childpath = joinpath(path, child)
yield self.trans_id_tree_path(childpath)
More information about the bazaar-commits
mailing list