/breezy-debian/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-debian/trunk

« back to all changes in this revision

Viewing changes to tests/test_source_distiller.py

  • Committer: Jelmer Vernooij
  • Date: 2018-10-20 22:07:46 UTC
  • Revision ID: jelmer@jelmer.uk-20181020220746-tq6dkzrkvc0nwtlu
Simplify source distiller.

Show diffs side-by-side

added added

removed removed

Lines of Context:
50
50
        wt = self.make_branch_and_tree(".")
51
51
        wt.lock_read()
52
52
        self.addCleanup(wt.unlock)
53
 
        sd = NativeSourceDistiller(wt, None, is_working_tree=True)
 
53
        sd = NativeSourceDistiller(wt)
54
54
        self.build_tree(['target/'])
55
55
        self.assertRaises(FileExists, sd.distill, 'target')
56
56
 
62
62
        wt.add(['a'])
63
63
        revid = wt.commit("one")
64
64
        rev_tree = wt.basis_tree()
65
 
        sd = NativeSourceDistiller(rev_tree, None)
 
65
        sd = NativeSourceDistiller(rev_tree)
66
66
        sd.distill('target')
67
67
        self.assertPathExists('target')
68
68
        self.assertPathExists('target/a')
77
77
                '.bzr-builddeb/default.conf'])
78
78
        revid = wt.commit("one")
79
79
        rev_tree = wt.basis_tree()
80
 
        sd = NativeSourceDistiller(rev_tree, None)
 
80
        sd = NativeSourceDistiller(rev_tree)
81
81
        sd.distill('target')
82
82
        self.assertPathExists('target')
83
83
        self.assertPathExists('target/a')
90
90
        wt.lock_write()
91
91
        self.addCleanup(wt.unlock)
92
92
        wt.add(['a', 'b'])
93
 
        sd = NativeSourceDistiller(wt, None, is_working_tree=True)
 
93
        sd = NativeSourceDistiller(wt)
94
94
        sd.distill('target')
95
95
        self.assertPathExists('target')
96
96
        self.assertPathExists('target/a')
142
142
        wt.lock_write()
143
143
        self.addCleanup(wt.unlock)
144
144
        wt.add(['a', 'b'])
145
 
        sd = FullSourceDistiller(wt, _TouchUpstreamProvider('tarball'),
146
 
                is_working_tree=True)
 
145
        sd = FullSourceDistiller(wt, _TouchUpstreamProvider('tarball'))
147
146
        sd.distill('target')
148
147
        self.assertPathExists('target')
149
148
        self.assertPathExists('target/a')
270
269
        version = Version("0.1-1")
271
270
        self.make_tarball(name, version)
272
271
        sd = MergeModeDistiller(wt, _SimpleUpstreamProvider(name,
273
 
                    version.upstream_version, "."), is_working_tree=True)
 
272
                    version.upstream_version, "."))
274
273
        sd.distill('target')
275
274
        self.assertPathExists('target')
276
275
        self.assertPathExists('target/debian/a')