← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-19 20:31:26 UTC
  • mfrom: (4595.8.5)
  • Revision ID: pqm@pqm.ubuntu.com-20090819203126-tcghmd36432ss7o8
(abentley) shelve_change handles 'modify text', introduce shelve_all.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
113
113
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
114
114
        self.assertFileEqual(expected_content, shelf_file)
115
115
 
116
 
    def test_shelve_content_change(self):
 
116
    def prepare_content_change(self):
117
117
        self.thisFailsStrictLockCheck()
118
118
        tree = self.make_branch_and_tree('.')
119
119
        tree.lock_write()
124
124
        self.build_tree_contents([('foo', 'b\na\nc\n')])
125
125
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
126
126
        self.addCleanup(creator.finalize)
 
127
        return creator
 
128
 
 
129
    def test_shelve_content_change(self):
 
130
        creator = self.prepare_content_change()
127
131
        self.assertEqual([('modify text', 'foo-id')],
128
132
                         list(creator.iter_shelvable()))
129
133
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
131
135
        self.assertFileEqual('a\nc\n', 'foo')
132
136
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
133
137
 
 
138
    def test_shelve_change_handles_modify_text(self):
 
139
        creator = self.prepare_content_change()
 
140
        creator.shelve_change(('modify text', 'foo-id'))
 
141
        creator.transform()
 
142
        self.assertFileEqual('a\n', 'foo')
 
143
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
144
 
 
145
    def test_shelve_all(self):
 
146
        creator = self.prepare_content_change()
 
147
        creator.shelve_all()
 
148
        creator.transform()
 
149
        self.assertFileEqual('a\n', 'foo')
 
150
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
134
151
 
135
152
    def prepare_shelve_creation(self):
136
153
        tree = self.make_branch_and_tree('.')