Rev 3580: Implement plan_merge and set_parent_ids on PreviewTree in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Jul 25 15:45:33 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3580
revision-id:pqm at pqm.ubuntu.com-20080725144520-ir7276gij462t1te
parent: pqm at pqm.ubuntu.com-20080725062645-tsvznpy0m5b0xqhy
parent: aaron at aaronbentley.com-20080722203743-365cpimh27w7nzrx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-25 15:45:20 +0100
message:
Implement plan_merge and set_parent_ids on PreviewTree
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.1.1.1.38.1.8
revision-id:aaron at aaronbentley.com-20080722203743-365cpimh27w7nzrx
parent: aaron at aaronbentley.com-20080722203358-ttyo4ltdqt9ea1kq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 16:37:43 -0400
message:
Ensure plan_file_merge works with a RevisionTree as the basis
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.1.1.1.38.1.7
revision-id:aaron at aaronbentley.com-20080722203358-ttyo4ltdqt9ea1kq
parent: aaron at aaronbentley.com-20080722202143-1mv4hl1p3n5g8zk6
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 16:33:58 -0400
message:
Fix up to use set_parent_ids
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
------------------------------------------------------------
revno: 3363.1.1.1.38.1.6
revision-id:aaron at aaronbentley.com-20080722202143-1mv4hl1p3n5g8zk6
parent: aaron at aaronbentley.com-20080722180649-desza99rl5386sjj
parent: aaron at aaronbentley.com-20080722201845-2uksn8b7k60wkd3o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 16:21:43 -0400
message:
Merge with set_parent_ids
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3571.1.1
revision-id:aaron at aaronbentley.com-20080722201845-2uksn8b7k60wkd3o
parent: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: set_parent_ids
timestamp: Tue 2008-07-22 16:18:45 -0400
message:
Allow set/get of parent_ids in PreviewTree
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.1.1.1.38.1.5
revision-id:aaron at aaronbentley.com-20080722180649-desza99rl5386sjj
parent: aaron at aaronbentley.com-20080722175734-oxfdwvh79qzw5upi
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 14:06:49 -0400
message:
Move killed-a from top to bottom
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.1.1.1.38.1.4
revision-id:aaron at aaronbentley.com-20080722175734-oxfdwvh79qzw5upi
parent: aaron at aaronbentley.com-20080703132850-y4zqn99hearrh81e
parent: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 13:57:34 -0400
message:
Merge with bzr.dev
added:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
contrib/bash/bzrbashprompt.sh bzrbashprompt.sh-20080414112733-b78chl4ubylc6775-1
doc/en/user-guide/stacked.txt stacked.txt-20080711023247-4uh9oovoka0sze8b-1
tools/win32/run_script.py run_script.py-20080717003927-k6itvarbtnwk44o9-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/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/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-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_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
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/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3363.1.1.1.38.1.3
revision-id:aaron at aaronbentley.com-20080703132850-y4zqn99hearrh81e
parent: aaron at aaronbentley.com-20080702191820-yhi9zv3swh75st1r
parent: pqm at pqm.ubuntu.com-20080703113657-6twl1rf07wq3o42d
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Thu 2008-07-03 09:28:50 -0400
message:
Merge with bzr.dev
added:
bzrlib/help_topics/en/patterns.txt patterns.txt-20080625070357-wx8qm46a19ejwfns-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3363.1.1.1.38.1.2
revision-id:aaron at aaronbentley.com-20080702191820-yhi9zv3swh75st1r
parent: aaron at aaronbentley.com-20080702150603-ho0gnodv6xagl5t1
parent: aaron at aaronbentley.com-20080702191803-8ton89iwa6p7h5ay
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Wed 2008-07-02 15:18:20 -0400
message:
Merge with is_executable
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.38.1.1
revision-id:aaron at aaronbentley.com-20080702150603-ho0gnodv6xagl5t1
parent: aaron at aaronbentley.com-20080702132722-xoxdhvdlo2eg0q4a
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Wed 2008-07-02 11:06:03 -0400
message:
Implement plan_merge, refactoring various bits
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2008-07-21 14:46:41 +0000
+++ b/bzrlib/tests/test_transform.py 2008-07-22 20:37:43 +0000
@@ -2314,3 +2314,55 @@
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'))
+
+ def test_get_set_parent_ids(self):
+ revision_tree, preview_tree = self.get_tree_and_preview_tree()
+ self.assertEqual([], preview_tree.get_parent_ids())
+ preview_tree.set_parent_ids(['rev-1'])
+ self.assertEqual(['rev-1'], preview_tree.get_parent_ids())
+
+ def test_plan_file_merge(self):
+ work_a = self.make_branch_and_tree('wta')
+ self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
+ work_a.add('file', 'file-id')
+ base_id = work_a.commit('base version')
+ tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
+ preview = TransformPreview(work_a)
+ self.addCleanup(preview.finalize)
+ trans_id = preview.trans_id_file_id('file-id')
+ preview.delete_contents(trans_id)
+ preview.create_file('b\nc\nd\ne\n', trans_id)
+ self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
+ tree_a = preview.get_preview_tree()
+ tree_a.set_parent_ids([base_id])
+ self.assertEqual([
+ ('killed-a', 'a\n'),
+ ('killed-b', 'b\n'),
+ ('unchanged', 'c\n'),
+ ('unchanged', 'd\n'),
+ ('new-a', 'e\n'),
+ ('new-b', 'f\n'),
+ ], list(tree_a.plan_file_merge('file-id', tree_b)))
+
+ def test_plan_file_merge_revision_tree(self):
+ work_a = self.make_branch_and_tree('wta')
+ self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
+ work_a.add('file', 'file-id')
+ base_id = work_a.commit('base version')
+ tree_b = work_a.bzrdir.sprout('wtb').open_workingtree()
+ preview = TransformPreview(work_a.basis_tree())
+ self.addCleanup(preview.finalize)
+ trans_id = preview.trans_id_file_id('file-id')
+ preview.delete_contents(trans_id)
+ preview.create_file('b\nc\nd\ne\n', trans_id)
+ self.build_tree_contents([('wtb/file', 'a\nc\nd\nf\n')])
+ tree_a = preview.get_preview_tree()
+ tree_a.set_parent_ids([base_id])
+ self.assertEqual([
+ ('killed-a', 'a\n'),
+ ('killed-b', 'b\n'),
+ ('unchanged', 'c\n'),
+ ('unchanged', 'd\n'),
+ ('new-a', 'e\n'),
+ ('new-b', 'f\n'),
+ ], list(tree_a.plan_file_merge('file-id', tree_b)))
=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- a/bzrlib/tests/tree_implementations/__init__.py 2008-07-17 02:49:32 +0000
+++ b/bzrlib/tests/tree_implementations/__init__.py 2008-07-22 20:33:58 +0000
@@ -74,7 +74,9 @@
def preview_tree_pre(testcase, tree):
tt = TransformPreview(tree)
testcase.addCleanup(tt.finalize)
- return tt.get_preview_tree()
+ preview_tree = tt.get_preview_tree()
+ preview_tree.set_parent_ids(tree.get_parent_ids())
+ return preview_tree
class TestTreeImplementationSupport(TestCaseWithTransport):
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2008-07-17 15:56:09 +0000
+++ b/bzrlib/transform.py 2008-07-22 20:21:43 +0000
@@ -1410,6 +1410,7 @@
self._transform = transform
self._final_paths = FinalPaths(transform)
self.__by_parent = None
+ self._parent_ids = []
def _changes(self, file_id):
for changes in self._transform.iter_changes():
@@ -1423,9 +1424,29 @@
# InterTree.iter_changes.
return (changes is not None and changes[2])
+ def _get_repository(self):
+ repo = getattr(self._transform._tree, '_repository', None)
+ if repo is None:
+ repo = self._transform._tree.branch.repository
+ return repo
+
+ def _iter_parent_trees(self):
+ for revision_id in self.get_parent_ids():
+ try:
+ yield self.revision_tree(revision_id)
+ except errors.NoSuchRevisionInTree:
+ yield self._get_repository().revision_tree(revision_id)
+
def _get_file_revision(self, file_id, vf, tree_revision):
- return self._transform._tree._get_file_revision(file_id, vf,
- tree_revision)
+ parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
+ self._iter_parent_trees()]
+ vf.add_lines((file_id, tree_revision), parent_keys,
+ self.get_file(file_id).readlines())
+ repo = self._get_repository()
+ base_vf = repo.texts
+ if base_vf not in vf.fallback_versionedfiles:
+ vf.fallback_versionedfiles.append(base_vf)
+ return tree_revision
def _stat_limbo_file(self, file_id):
trans_id = self._transform.trans_id_file_id(file_id)
@@ -1682,7 +1703,10 @@
return self._transform._tree.walkdirs(prefix)
def get_parent_ids(self):
- return self._transform._tree.get_parent_ids()
+ return self._parent_ids
+
+ def set_parent_ids(self, parent_ids):
+ self._parent_ids = parent_ids
def get_revision_tree(self, revision_id):
return self._transform._tree.get_revision_tree(revision_id)
=== modified file 'bzrlib/tree.py'
--- a/bzrlib/tree.py 2008-07-02 19:51:05 +0000
+++ b/bzrlib/tree.py 2008-07-03 13:28:50 +0000
@@ -374,32 +374,36 @@
return vf.plan_lca_merge(last_revision_a, last_revision_b,
last_revision_base)
+ def _iter_parent_trees(self):
+ """Iterate through parent trees, defaulting to Tree.revision_tree."""
+ for revision_id in self.get_parent_ids():
+ try:
+ yield self.revision_tree(revision_id)
+ except errors.NoSuchRevisionInTree:
+ yield self.repository.revision_tree(revision_id)
+
+ @staticmethod
+ def _file_revision(revision_tree, file_id):
+ """Determine the revision associated with a file in a given tree."""
+ revision_tree.lock_read()
+ try:
+ return revision_tree.inventory[file_id].revision
+ finally:
+ revision_tree.unlock()
+
def _get_file_revision(self, file_id, vf, tree_revision):
"""Ensure that file_id, tree_revision is in vf to plan the merge."""
- def file_revision(revision_tree):
- revision_tree.lock_read()
- try:
- return revision_tree.inventory[file_id].revision
- finally:
- revision_tree.unlock()
-
- def iter_parent_trees():
- for revision_id in self.get_parent_ids():
- try:
- yield self.revision_tree(revision_id)
- except:
- yield self.repository.revision_tree(revision_id)
if getattr(self, '_repository', None) is None:
last_revision = tree_revision
- parent_keys = [(file_id, file_revision(t)) for t in
- iter_parent_trees()]
+ parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
+ self._iter_parent_trees()]
vf.add_lines((file_id, last_revision), parent_keys,
self.get_file(file_id).readlines())
repo = self.branch.repository
base_vf = repo.texts
else:
- last_revision = file_revision(self)
+ last_revision = self._file_revision(self, file_id)
base_vf = self._repository.texts
if base_vf not in vf.fallback_versionedfiles:
vf.fallback_versionedfiles.append(base_vf)
More information about the bazaar-commits
mailing list