/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-30 14:18:22 UTC
  • mfrom: (6456 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120130141822-u4fqwswoyew4a14a
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
88
88
 
89
89
    def setUp(self):
90
90
        super(TestTreeTransform, self).setUp()
91
 
        self.wt = self.make_branch_and_tree('.', format='dirstate-with-subtree')
 
91
        self.wt = self.make_branch_and_tree('.', format='development-subtree')
92
92
        os.chdir('..')
93
93
 
94
94
    def get_transform(self):
1761
1761
        merge_modified = this.wt.merge_modified()
1762
1762
        self.assertSubset(merge_modified, modified)
1763
1763
        self.assertEqual(len(merge_modified), len(modified))
1764
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1764
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1765
1765
        modified.pop(0)
1766
1766
        merge_modified = this.wt.merge_modified()
1767
1767
        self.assertSubset(merge_modified, modified)
1883
1883
        os.mkdir('a')
1884
1884
        a = BzrDir.create_standalone_workingtree('a')
1885
1885
        os.mkdir('a/foo')
1886
 
        file('a/foo/bar', 'wb').write('contents')
 
1886
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1887
1887
        os.symlink('a/foo/bar', 'a/foo/baz')
1888
1888
        a.add(['foo', 'foo/bar', 'foo/baz'])
1889
1889
        a.commit('initial commit')
1898
1898
 
1899
1899
    def test_build_with_references(self):
1900
1900
        tree = self.make_branch_and_tree('source',
1901
 
            format='dirstate-with-subtree')
 
1901
            format='development-subtree')
1902
1902
        subtree = self.make_branch_and_tree('source/subtree',
1903
 
            format='dirstate-with-subtree')
 
1903
            format='development-subtree')
1904
1904
        tree.add_reference(subtree)
1905
1905
        tree.commit('a revision')
1906
1906
        tree.branch.create_checkout('target')
3634
3634
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3635
3635
 
3636
3636
    def _set_orphan_policy(self, wt, policy):
3637
 
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
 
3637
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
3638
3638
                                               policy)
3639
3639
 
3640
3640
    def _prepare_orphan(self, wt):