/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 brzlib/tests/test_rename_map.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_rename_map.py
17
17
 
18
18
import os
19
19
 
20
 
from breezy import trace
21
 
from breezy.rename_map import RenameMap
22
 
from breezy.tests import TestCaseWithTransport
 
20
from brzlib import trace
 
21
from brzlib.rename_map import RenameMap
 
22
from brzlib.tests import TestCaseWithTransport
23
23
 
24
24
 
25
25
def myhash(val):
29
29
 
30
30
class TestRenameMap(TestCaseWithTransport):
31
31
 
32
 
    a_lines = b'a\nb\nc\n'.splitlines(True)
33
 
    b_lines = b'b\nc\nd\n'.splitlines(True)
 
32
    a_lines = 'a\nb\nc\n'.splitlines(True)
 
33
    b_lines = 'b\nc\nd\n'.splitlines(True)
 
34
 
34
35
 
35
36
    def test_add_edge_hashes(self):
36
37
        rn = RenameMap(None)
37
38
        rn.add_edge_hashes(self.a_lines, 'a')
38
 
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
39
 
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
 
39
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('a\n', 'b\n'))])
 
40
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('b\n', 'c\n'))])
40
41
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
41
42
 
42
43
    def test_add_file_edge_hashes(self):
43
44
        tree = self.make_branch_and_tree('tree')
44
 
        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
45
 
        tree.add('a', b'a')
 
45
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
 
46
        tree.add('a', 'a')
46
47
        rn = RenameMap(tree)
47
 
        rn.add_file_edge_hashes(tree, [b'a'])
48
 
        self.assertEqual({b'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
49
 
        self.assertEqual({b'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
 
48
        rn.add_file_edge_hashes(tree, ['a'])
 
49
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('a\n', 'b\n'))])
 
50
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('b\n', 'c\n'))])
50
51
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
51
52
 
52
53
    def test_hitcounts(self):
62
63
        rn = RenameMap(tree)
63
64
        rn.add_edge_hashes(self.a_lines, 'aid')
64
65
        rn.add_edge_hashes(self.b_lines, 'bid')
65
 
        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
66
 
        self.build_tree_contents([('tree/b', b''.join(self.b_lines))])
 
66
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
 
67
        self.build_tree_contents([('tree/b', ''.join(self.b_lines))])
67
68
        self.assertEqual({'a': 'aid', 'b': 'bid'},
68
69
                         rn.file_match(['a', 'b']))
69
70
 
71
72
        tree = self.make_branch_and_tree('tree')
72
73
        rn = RenameMap(tree)
73
74
        rn.add_edge_hashes(self.a_lines, 'aid')
74
 
        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
75
 
        self.build_tree_contents([('tree/b', b''.join(self.b_lines))])
76
 
        self.build_tree_contents([('tree/c', b''.join(self.b_lines))])
 
75
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
 
76
        self.build_tree_contents([('tree/b', ''.join(self.b_lines))])
 
77
        self.build_tree_contents([('tree/c', ''.join(self.b_lines))])
77
78
        self.assertEqual({'a': 'aid'},
78
79
                         rn.file_match(['a', 'b', 'c']))
79
80
 
86
87
            'path3/path4/path5': 'c',
87
88
        })
88
89
        self.assertEqual(
89
 
            {'path2': {'b'}, 'path3/path4': {'c'}, 'path3': set()},
 
90
            {'path2': set(['b']), 'path3/path4': set(['c']), 'path3': set()},
90
91
            required_parents)
91
92
 
92
93
    def test_find_directory_renames(self):
97
98
            'path3/path4/path5': 'c',
98
99
        }
99
100
        required_parents = {
100
 
            'path2': {'b'},
101
 
            'path3/path4': {'c'},
 
101
            'path2': set(['b']),
 
102
            'path3/path4': set(['c']),
102
103
            'path3': set([])}
103
104
        missing_parents = {
104
 
            'path2-id': {'b'},
105
 
            'path4-id': {'c'},
106
 
            'path3-id': {'path4-id'}}
 
105
            'path2-id': set(['b']),
 
106
            'path4-id': set(['c']),
 
107
            'path3-id': set(['path4-id'])}
107
108
        matches = rn.match_parents(required_parents, missing_parents)
108
109
        self.assertEqual({'path3/path4': 'path4-id', 'path2': 'path2-id'},
109
110
                         matches)
113
114
        tree.lock_write()
114
115
        self.addCleanup(tree.unlock)
115
116
        self.build_tree(['tree/file'])
116
 
        tree.add('file', b'file-id')
 
117
        tree.add('file', 'file-id')
117
118
        tree.commit('Added file')
118
119
        os.rename('tree/file', 'tree/file2')
119
 
        RenameMap.guess_renames(tree.basis_tree(), tree)
120
 
        self.assertEqual('file2', tree.id2path(b'file-id'))
 
120
        RenameMap.guess_renames(tree)
 
121
        self.assertEqual('file2', tree.id2path('file-id'))
121
122
 
122
123
    def test_guess_renames_handles_directories(self):
123
124
        tree = self.make_branch_and_tree('tree')
124
125
        tree.lock_write()
125
126
        self.addCleanup(tree.unlock)
126
127
        self.build_tree(['tree/dir/', 'tree/dir/file'])
127
 
        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
 
128
        tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
128
129
        tree.commit('Added file')
129
130
        os.rename('tree/dir', 'tree/dir2')
130
 
        RenameMap.guess_renames(tree.basis_tree(), tree)
131
 
        self.assertEqual('dir2/file', tree.id2path(b'file-id'))
132
 
        self.assertEqual('dir2', tree.id2path(b'dir-id'))
 
131
        RenameMap.guess_renames(tree)
 
132
        self.assertEqual('dir2/file', tree.id2path('file-id'))
 
133
        self.assertEqual('dir2', tree.id2path('dir-id'))
133
134
 
134
135
    def test_guess_renames_handles_grandparent_directories(self):
135
136
        tree = self.make_branch_and_tree('tree')
139
140
                         'tree/topdir/middledir/',
140
141
                         'tree/topdir/middledir/file'])
141
142
        tree.add(['topdir', 'topdir/middledir', 'topdir/middledir/file'],
142
 
                 [b'topdir-id', b'middledir-id', b'file-id'])
 
143
                 ['topdir-id', 'middledir-id', 'file-id'])
143
144
        tree.commit('Added files.')
144
145
        os.rename('tree/topdir', 'tree/topdir2')
145
 
        RenameMap.guess_renames(tree.basis_tree(), tree)
146
 
        self.assertEqual('topdir2', tree.id2path(b'topdir-id'))
 
146
        RenameMap.guess_renames(tree)
 
147
        self.assertEqual('topdir2', tree.id2path('topdir-id'))
147
148
 
148
149
    def test_guess_renames_preserves_children(self):
149
150
        """When a directory has been moved, its children are preserved."""
150
151
        tree = self.make_branch_and_tree('tree')
151
152
        tree.lock_write()
152
153
        self.addCleanup(tree.unlock)
153
 
        self.build_tree_contents([('tree/foo/', b''),
154
 
                                  ('tree/foo/bar', b'bar'),
155
 
                                  ('tree/foo/empty', b'')])
 
154
        self.build_tree_contents([('tree/foo/', ''),
 
155
                                  ('tree/foo/bar', 'bar'),
 
156
                                  ('tree/foo/empty', '')])
156
157
        tree.add(['foo', 'foo/bar', 'foo/empty'],
157
 
                 [b'foo-id', b'bar-id', b'empty-id'])
 
158
                 ['foo-id', 'bar-id', 'empty-id'])
158
159
        tree.commit('rev1')
159
160
        os.rename('tree/foo', 'tree/baz')
160
 
        RenameMap.guess_renames(tree.basis_tree(), tree)
161
 
        self.assertEqual('baz/empty', tree.id2path(b'empty-id'))
 
161
        RenameMap.guess_renames(tree)
 
162
        self.assertEqual('baz/empty', tree.id2path('empty-id'))
162
163
 
163
164
    def test_guess_renames_dry_run(self):
164
165
        tree = self.make_branch_and_tree('tree')
165
166
        tree.lock_write()
166
167
        self.addCleanup(tree.unlock)
167
168
        self.build_tree(['tree/file'])
168
 
        tree.add('file', b'file-id')
 
169
        tree.add('file', 'file-id')
169
170
        tree.commit('Added file')
170
171
        os.rename('tree/file', 'tree/file2')
171
 
        RenameMap.guess_renames(tree.basis_tree(), tree, dry_run=True)
172
 
        self.assertEqual('file', tree.id2path(b'file-id'))
 
172
        RenameMap.guess_renames(tree, dry_run=True)
 
173
        self.assertEqual('file', tree.id2path('file-id'))
173
174
 
174
175
    @staticmethod
175
176
    def captureNotes(cmd, *args, **kwargs):
176
177
        notes = []
177
 
 
178
178
        def my_note(fmt, *args):
179
179
            notes.append(fmt % args)
180
180
        old_note = trace.note
191
191
        tree.lock_write()
192
192
        self.addCleanup(tree.unlock)
193
193
        self.build_tree(['tree/file'])
194
 
        tree.add('file', b'file-id')
 
194
        tree.add('file', 'file-id')
195
195
        tree.commit('Added file')
196
196
        os.rename('tree/file', 'tree/file2')
197
 
        notes = self.captureNotes(
198
 
            RenameMap.guess_renames, tree.basis_tree(), tree,
199
 
            dry_run=True)[0]
200
 
        self.assertEqual('file => file2', ''.join(notes))
201
 
        notes = self.captureNotes(RenameMap.guess_renames, tree.basis_tree(),
202
 
                                  tree, dry_run=False)[0]
203
 
        self.assertEqual('file => file2', ''.join(notes))
204
 
 
205
 
    def test_guess_rename_handles_new_directories(self):
206
 
        """When a file was moved into a new directory."""
207
 
        tree = self.make_branch_and_tree('.')
208
 
        tree.lock_write()
209
 
        # self.addCleanup(tree.unlock)
210
 
        self.build_tree(['file'])
211
 
        tree.add('file', b'file-id')
212
 
        tree.commit('Added file')
213
 
        os.mkdir('folder')
214
 
        os.rename('file', 'folder/file2')
215
 
        notes = self.captureNotes(
216
 
            RenameMap.guess_renames, tree.basis_tree(), tree)[0]
217
 
        self.assertEqual('file => folder/file2', ''.join(notes))
218
 
 
219
 
        tree.unlock()
 
197
        notes = self.captureNotes(RenameMap.guess_renames, tree,
 
198
                                  dry_run=True)[0]
 
199
        self.assertEqual('file => file2', ''.join(notes))
 
200
        notes = self.captureNotes(RenameMap.guess_renames, tree,
 
201
                                  dry_run=False)[0]
 
202
        self.assertEqual('file => file2', ''.join(notes))