~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit.py

Move rename_one from Branch to WorkingTree. (Robert Collins).

Show diffs side-by-side

added added

removed removed

Lines of Context:
145
145
    def test_commit_rename(self):
146
146
        """Test commit of a revision where a file is renamed."""
147
147
        b = Branch.initialize('.')
 
148
        tree = WorkingTree('.', b)
148
149
        self.build_tree(['hello'])
149
 
        b.working_tree().add(['hello'], ['hello-id'])
150
 
        b.working_tree().commit(message='one', rev_id='test@rev-1', allow_pointless=False)
 
150
        tree.add(['hello'], ['hello-id'])
 
151
        tree.commit(message='one', rev_id='test@rev-1', allow_pointless=False)
151
152
 
152
 
        b.rename_one('hello', 'fruity')
153
 
        b.working_tree().commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
 
153
        tree.rename_one('hello', 'fruity')
 
154
        tree.commit(message='renamed', rev_id='test@rev-2', allow_pointless=False)
154
155
 
155
156
        eq = self.assertEquals
156
157
        tree1 = b.revision_tree('test@rev-1')