← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf_ui.py

  • Committer: Aaron Bentley
  • Date: 2008-10-31 15:08:29 UTC
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081031150829-pr859af4whdp849u
Turn diff_file and text_differ into instance variables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
26
26
 
27
27
    def __init__(self, work_tree, target_tree, path=None, auto=False,
28
28
                 auto_apply=False, file_list=None, message=None):
29
 
        shelf_ui.Shelver.__init__(self, work_tree, target_tree, path,
30
 
                                  auto, auto_apply, file_list, message)
 
29
        shelf_ui.Shelver.__init__(self, work_tree, target_tree, auto,
 
30
                                  auto_apply, file_list, message)
31
31
        self.expected = []
32
32
        self.diff_writer = StringIO()
33
33
 
200
200
        tree.add('foo', 'foo-id')
201
201
        tree.commit('added foo')
202
202
        self.build_tree_contents([('tree/foo', LINES_ZY)])
203
 
        shelf_ui.Shelver(tree, tree.basis_tree(), None, auto_apply=True,
 
203
        shelf_ui.Shelver(tree, tree.basis_tree(), auto_apply=True,
204
204
                         auto=True).run()
205
205
        return tree
206
206