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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/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 bzrlib import trace
 
21
from bzrlib.rename_map import RenameMap
 
22
from bzrlib.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
36
    def test_add_edge_hashes(self):
37
37
        rn = RenameMap(None)
38
38
        rn.add_edge_hashes(self.a_lines, 'a')
39
 
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
40
 
        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'))])
41
41
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
42
42
 
43
43
    def test_add_file_edge_hashes(self):
44
44
        tree = self.make_branch_and_tree('tree')
45
 
        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
46
 
        tree.add('a', b'a')
 
45
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
 
46
        tree.add('a', 'a')
47
47
        rn = RenameMap(tree)
48
48
        rn.add_file_edge_hashes(tree, ['a'])
49
 
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
50
 
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
 
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'))])
51
51
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
52
52
 
53
53
    def test_hitcounts(self):
72
72
        tree = self.make_branch_and_tree('tree')
73
73
        rn = RenameMap(tree)
74
74
        rn.add_edge_hashes(self.a_lines, 'aid')
75
 
        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
76
 
        self.build_tree_contents([('tree/b', b''.join(self.b_lines))])
77
 
        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))])
78
78
        self.assertEqual({'a': 'aid'},
79
79
                         rn.file_match(['a', 'b', 'c']))
80
80
 
87
87
            'path3/path4/path5': 'c',
88
88
        })
89
89
        self.assertEqual(
90
 
            {'path2': {'b'}, 'path3/path4': {'c'}, 'path3': set()},
 
90
            {'path2': set(['b']), 'path3/path4': set(['c']), 'path3': set()},
91
91
            required_parents)
92
92
 
93
93
    def test_find_directory_renames(self):
98
98
            'path3/path4/path5': 'c',
99
99
        }
100
100
        required_parents = {
101
 
            'path2': {'b'},
102
 
            'path3/path4': {'c'},
 
101
            'path2': set(['b']),
 
102
            'path3/path4': set(['c']),
103
103
            'path3': set([])}
104
104
        missing_parents = {
105
 
            'path2-id': {'b'},
106
 
            'path4-id': {'c'},
107
 
            'path3-id': {'path4-id'}}
 
105
            'path2-id': set(['b']),
 
106
            'path4-id': set(['c']),
 
107
            'path3-id': set(['path4-id'])}
108
108
        matches = rn.match_parents(required_parents, missing_parents)
109
109
        self.assertEqual({'path3/path4': 'path4-id', 'path2': 'path2-id'},
110
110
                         matches)
114
114
        tree.lock_write()
115
115
        self.addCleanup(tree.unlock)
116
116
        self.build_tree(['tree/file'])
117
 
        tree.add('file', b'file-id')
 
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.basis_tree(), tree)
121
 
        self.assertEqual('file2', tree.id2path(b'file-id'))
 
120
        RenameMap.guess_renames(tree)
 
121
        self.assertEqual('file2', tree.id2path('file-id'))
122
122
 
123
123
    def test_guess_renames_handles_directories(self):
124
124
        tree = self.make_branch_and_tree('tree')
125
125
        tree.lock_write()
126
126
        self.addCleanup(tree.unlock)
127
127
        self.build_tree(['tree/dir/', 'tree/dir/file'])
128
 
        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
 
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.basis_tree(), tree)
132
 
        self.assertEqual('dir2/file', tree.id2path(b'file-id'))
133
 
        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'))
134
134
 
135
135
    def test_guess_renames_handles_grandparent_directories(self):
136
136
        tree = self.make_branch_and_tree('tree')
140
140
                         'tree/topdir/middledir/',
141
141
                         'tree/topdir/middledir/file'])
142
142
        tree.add(['topdir', 'topdir/middledir', 'topdir/middledir/file'],
143
 
                 [b'topdir-id', b'middledir-id', b'file-id'])
 
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.basis_tree(), tree)
147
 
        self.assertEqual('topdir2', tree.id2path(b'topdir-id'))
 
146
        RenameMap.guess_renames(tree)
 
147
        self.assertEqual('topdir2', tree.id2path('topdir-id'))
148
148
 
149
149
    def test_guess_renames_preserves_children(self):
150
150
        """When a directory has been moved, its children are preserved."""
151
151
        tree = self.make_branch_and_tree('tree')
152
152
        tree.lock_write()
153
153
        self.addCleanup(tree.unlock)
154
 
        self.build_tree_contents([('tree/foo/', b''),
155
 
                                  ('tree/foo/bar', b'bar'),
156
 
                                  ('tree/foo/empty', b'')])
 
154
        self.build_tree_contents([('tree/foo/', ''),
 
155
                                  ('tree/foo/bar', 'bar'),
 
156
                                  ('tree/foo/empty', '')])
157
157
        tree.add(['foo', 'foo/bar', 'foo/empty'],
158
 
                 [b'foo-id', b'bar-id', b'empty-id'])
 
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.basis_tree(), tree)
162
 
        self.assertEqual('baz/empty', tree.id2path(b'empty-id'))
 
161
        RenameMap.guess_renames(tree)
 
162
        self.assertEqual('baz/empty', tree.id2path('empty-id'))
163
163
 
164
164
    def test_guess_renames_dry_run(self):
165
165
        tree = self.make_branch_and_tree('tree')
166
166
        tree.lock_write()
167
167
        self.addCleanup(tree.unlock)
168
168
        self.build_tree(['tree/file'])
169
 
        tree.add('file', b'file-id')
 
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.basis_tree(), tree, dry_run=True)
173
 
        self.assertEqual('file', tree.id2path(b'file-id'))
 
172
        RenameMap.guess_renames(tree, dry_run=True)
 
173
        self.assertEqual('file', tree.id2path('file-id'))
174
174
 
175
175
    @staticmethod
176
176
    def captureNotes(cmd, *args, **kwargs):
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))