/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: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

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