← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Martin Pool
  • Date: 2009-09-14 01:48:28 UTC
  • mfrom: (4685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090914014828-ydr9rlkdfq2sv57z
Merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1916
1916
        branch.lock_write()
1917
1917
        self.addCleanup(branch.unlock)
1918
1918
        tt = TransformPreview(branch.basis_tree())
 
1919
        self.addCleanup(tt.finalize)
1919
1920
        tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
1920
1921
        rev = tt.commit(branch, 'my message')
1921
1922
        self.assertEqual([], branch.basis_tree().get_parent_ids())
1927
1928
        branch.lock_write()
1928
1929
        self.addCleanup(branch.unlock)
1929
1930
        tt = TransformPreview(branch.basis_tree())
 
1931
        self.addCleanup(tt.finalize)
1930
1932
        e = self.assertRaises(ValueError, tt.commit, branch,
1931
1933
                          'my message', ['rev1b-id'])
1932
1934
        self.assertEqual('Cannot supply merge parents for first commit.',
1957
1959
        tt.new_file('file', tt.root, 'contents', 'file-id')
1958
1960
        tt.commit(branch, 'message', strict=True)
1959
1961
        tt = TransformPreview(branch.basis_tree())
 
1962
        self.addCleanup(tt.finalize)
1960
1963
        trans_id = tt.trans_id_file_id('file-id')
1961
1964
        tt.delete_contents(trans_id)
1962
1965
        tt.create_file('contents', trans_id)
2146
2149
    def create_tree(self):
2147
2150
        tree = self.make_branch_and_tree('.')
2148
2151
        self.build_tree_contents([('a', 'content 1')])
 
2152
        tree.set_root_id('TREE_ROOT')
2149
2153
        tree.add('a', 'a-id')
2150
2154
        tree.commit('rev1', rev_id='rev1')
2151
2155
        return tree.branch.repository.revision_tree('rev1')
2667
2671
 
2668
2672
    def test_merge_preview_into_workingtree(self):
2669
2673
        tree = self.make_branch_and_tree('tree')
 
2674
        tree.set_root_id('TREE_ROOT')
2670
2675
        tt = TransformPreview(tree)
2671
2676
        self.addCleanup(tt.finalize)
2672
2677
        tt.new_file('name', tt.root, 'content', 'file-id')
2673
2678
        tree2 = self.make_branch_and_tree('tree2')
 
2679
        tree2.set_root_id('TREE_ROOT')
2674
2680
        pb = progress.DummyProgress()
2675
2681
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2676
2682
                                         pb, tree.basis_tree())