/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_rename_map.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_rename_map.py
117
117
        tree.add('file', 'file-id')
118
118
        tree.commit('Added file')
119
119
        os.rename('tree/file', 'tree/file2')
120
 
        RenameMap.guess_renames(tree)
 
120
        RenameMap.guess_renames(tree.basis_tree(), tree)
121
121
        self.assertEqual('file2', tree.id2path('file-id'))
122
122
 
123
123
    def test_guess_renames_handles_directories(self):
128
128
        tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
129
129
        tree.commit('Added file')
130
130
        os.rename('tree/dir', 'tree/dir2')
131
 
        RenameMap.guess_renames(tree)
 
131
        RenameMap.guess_renames(tree.basis_tree(), tree)
132
132
        self.assertEqual('dir2/file', tree.id2path('file-id'))
133
133
        self.assertEqual('dir2', tree.id2path('dir-id'))
134
134
 
143
143
                 ['topdir-id', 'middledir-id', 'file-id'])
144
144
        tree.commit('Added files.')
145
145
        os.rename('tree/topdir', 'tree/topdir2')
146
 
        RenameMap.guess_renames(tree)
 
146
        RenameMap.guess_renames(tree.basis_tree(), tree)
147
147
        self.assertEqual('topdir2', tree.id2path('topdir-id'))
148
148
 
149
149
    def test_guess_renames_preserves_children(self):
158
158
                 ['foo-id', 'bar-id', 'empty-id'])
159
159
        tree.commit('rev1')
160
160
        os.rename('tree/foo', 'tree/baz')
161
 
        RenameMap.guess_renames(tree)
 
161
        RenameMap.guess_renames(tree.basis_tree(), tree)
162
162
        self.assertEqual('baz/empty', tree.id2path('empty-id'))
163
163
 
164
164
    def test_guess_renames_dry_run(self):
169
169
        tree.add('file', 'file-id')
170
170
        tree.commit('Added file')
171
171
        os.rename('tree/file', 'tree/file2')
172
 
        RenameMap.guess_renames(tree, dry_run=True)
 
172
        RenameMap.guess_renames(tree.basis_tree(), tree, dry_run=True)
173
173
        self.assertEqual('file', tree.id2path('file-id'))
174
174
 
175
175
    @staticmethod
194
194
        tree.add('file', 'file-id')
195
195
        tree.commit('Added file')
196
196
        os.rename('tree/file', 'tree/file2')
197
 
        notes = self.captureNotes(RenameMap.guess_renames, tree,
198
 
                                  dry_run=True)[0]
 
197
        notes = self.captureNotes(
 
198
                RenameMap.guess_renames, tree.basis_tree(), tree,
 
199
                dry_run=True)[0]
199
200
        self.assertEqual('file => file2', ''.join(notes))
200
 
        notes = self.captureNotes(RenameMap.guess_renames, tree,
201
 
                                  dry_run=False)[0]
 
201
        notes = self.captureNotes(RenameMap.guess_renames, tree.basis_tree(),
 
202
                tree, dry_run=False)[0]
202
203
        self.assertEqual('file => file2', ''.join(notes))
203
204
 
204
205
    def test_guess_rename_handles_new_directories(self):
211
212
        tree.commit('Added file')
212
213
        os.mkdir('folder')
213
214
        os.rename('file', 'folder/file2')
214
 
        notes = self.captureNotes(RenameMap.guess_renames, tree)[0]
 
215
        notes = self.captureNotes(
 
216
                RenameMap.guess_renames, tree.basis_tree(), tree)[0]
215
217
        self.assertEqual('file => folder/file2', ''.join(notes))
216
218
 
217
219
        tree.unlock()