/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 breezy/tests/test_transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-22 11:16:17 UTC
  • mfrom: (7350.5.1 objects-2b)
  • Revision ID: breezy.the.bot@gmail.com-20190622111617-3l35prm7m184yvo1
Remove file_id from transform's create_from_tree, get filter tree paths by path.

Merged from https://code.launchpad.net/~jelmer/brz/objects-2b/+merge/368930

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
1666
1666
        tree2 = self.make_branch_and_tree('tree2')
1667
1667
        tt = TreeTransform(tree2)
1668
1668
        foo_trans_id = tt.create_path('foo', tt.root)
1669
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
 
1669
        create_from_tree(tt, foo_trans_id, tree1, 'foo')
1670
1670
        bar_trans_id = tt.create_path('bar', tt.root)
1671
 
        create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id=b'bar-id')
 
1671
        create_from_tree(tt, bar_trans_id, tree1, 'bar')
1672
1672
        tt.apply()
1673
1673
        self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1674
1674
        self.assertFileEqual(b'baz', 'tree2/bar')
1681
1681
        tree2 = self.make_branch_and_tree('tree2')
1682
1682
        tt = TreeTransform(tree2)
1683
1683
        foo_trans_id = tt.create_path('foo', tt.root)
1684
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id',
1685
 
                         chunks=[b'qux'])
 
1684
        create_from_tree(tt, foo_trans_id, tree1, 'foo', chunks=[b'qux'])
1686
1685
        tt.apply()
1687
1686
        self.assertFileEqual(b'qux', 'tree2/foo')
1688
1687
 
1693
1692
        tree1.add('foo', b'foo-id')
1694
1693
        tt = TreeTransform(self.make_branch_and_tree('tree2'))
1695
1694
        foo_trans_id = tt.create_path('foo', tt.root)
1696
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id=b'foo-id')
 
1695
        create_from_tree(tt, foo_trans_id, tree1, 'foo')
1697
1696
        tt.apply()
1698
1697
        self.assertEqual('bar', os.readlink('tree2/foo'))
1699
1698