/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3193.8.13 by Aaron Bentley
Update texts
1
# Copyright (C) 2009 Canonical Ltd
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
3193.8.32 by Aaron Bentley
Update GPL preamble
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3193.8.13 by Aaron Bentley
Update texts
16
17
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
18
import os
19
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
20
from breezy import trace
21
from breezy.rename_map import RenameMap
22
from breezy.tests import TestCaseWithTransport
3193.8.4 by Aaron Bentley
Get rename detection working for files.
23
3193.8.8 by Aaron Bentley
Get tests passing.
24
25
def myhash(val):
26
    """This the hash used by RenameMap."""
3193.8.10 by Aaron Bentley
Update to weight hits and use 10M of keyspace
27
    return hash(val) % (1024 * 1024 * 10)
3193.8.8 by Aaron Bentley
Get tests passing.
28
29
3193.8.4 by Aaron Bentley
Get rename detection working for files.
30
class TestRenameMap(TestCaseWithTransport):
31
6855.4.1 by Jelmer Vernooij
Yet more bees.
32
    a_lines = b'a\nb\nc\n'.splitlines(True)
33
    b_lines = b'b\nc\nd\n'.splitlines(True)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
34
35
36
    def test_add_edge_hashes(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
37
        rn = RenameMap(None)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
38
        rn.add_edge_hashes(self.a_lines, 'a')
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
39
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
40
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
3193.8.8 by Aaron Bentley
Get tests passing.
41
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
3193.8.4 by Aaron Bentley
Get rename detection working for files.
42
43
    def test_add_file_edge_hashes(self):
44
        tree = self.make_branch_and_tree('tree')
6855.4.1 by Jelmer Vernooij
Yet more bees.
45
        self.build_tree_contents([('tree/a', b''.join(self.a_lines))])
46
        tree.add('a', b'a')
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
47
        rn = RenameMap(tree)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
48
        rn.add_file_edge_hashes(tree, ['a'])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
49
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('a\n', 'b\n'))])
50
        self.assertEqual({'a'}, rn.edge_hashes[myhash(('b\n', 'c\n'))])
3193.8.8 by Aaron Bentley
Get tests passing.
51
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
3193.8.4 by Aaron Bentley
Get rename detection working for files.
52
53
    def test_hitcounts(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
54
        rn = RenameMap(None)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
55
        rn.add_edge_hashes(self.a_lines, 'a')
56
        rn.add_edge_hashes(self.b_lines, 'b')
3193.8.10 by Aaron Bentley
Update to weight hits and use 10M of keyspace
57
        self.assertEqual({'a': 2.5, 'b': 0.5}, rn.hitcounts(self.a_lines))
3193.8.4 by Aaron Bentley
Get rename detection working for files.
58
        self.assertEqual({'a': 1}, rn.hitcounts(self.a_lines[:-1]))
3193.8.10 by Aaron Bentley
Update to weight hits and use 10M of keyspace
59
        self.assertEqual({'b': 2.5, 'a': 0.5}, rn.hitcounts(self.b_lines))
3193.8.4 by Aaron Bentley
Get rename detection working for files.
60
61
    def test_file_match(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
62
        tree = self.make_branch_and_tree('tree')
63
        rn = RenameMap(tree)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
64
        rn.add_edge_hashes(self.a_lines, 'aid')
65
        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))])
68
        self.assertEqual({'a': 'aid', 'b': 'bid'},
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
69
                         rn.file_match(['a', 'b']))
3193.8.5 by Aaron Bentley
Improve rename detection
70
71
    def test_file_match_no_dups(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
72
        tree = self.make_branch_and_tree('tree')
73
        rn = RenameMap(tree)
3193.8.5 by Aaron Bentley
Improve rename detection
74
        rn.add_edge_hashes(self.a_lines, 'aid')
6855.4.1 by Jelmer Vernooij
Yet more bees.
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))])
3193.8.5 by Aaron Bentley
Improve rename detection
78
        self.assertEqual({'a': 'aid'},
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
79
                         rn.file_match(['a', 'b', 'c']))
3193.8.16 by Aaron Bentley
Get a dict of required parents.
80
81
    def test_match_directories(self):
82
        tree = self.make_branch_and_tree('tree')
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
83
        rn = RenameMap(tree)
3193.8.16 by Aaron Bentley
Get a dict of required parents.
84
        required_parents = rn.get_required_parents({
85
            'path1': 'a',
86
            'path2/tr': 'b',
3193.8.17 by Aaron Bentley
Get directory rename handling working.
87
            'path3/path4/path5': 'c',
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
88
        })
3193.8.17 by Aaron Bentley
Get directory rename handling working.
89
        self.assertEqual(
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
90
            {'path2': {'b'}, 'path3/path4': {'c'}, 'path3': set()},
3193.8.17 by Aaron Bentley
Get directory rename handling working.
91
            required_parents)
92
93
    def test_find_directory_renames(self):
94
        tree = self.make_branch_and_tree('tree')
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
95
        rn = RenameMap(tree)
3193.8.17 by Aaron Bentley
Get directory rename handling working.
96
        matches = {
97
            'path1': 'a',
98
            'path3/path4/path5': 'c',
99
        }
100
        required_parents = {
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
101
            'path2': {'b'},
102
            'path3/path4': {'c'},
3193.8.17 by Aaron Bentley
Get directory rename handling working.
103
            'path3': set([])}
104
        missing_parents = {
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
105
            'path2-id': {'b'},
106
            'path4-id': {'c'},
107
            'path3-id': {'path4-id'}}
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
108
        matches = rn.match_parents(required_parents, missing_parents)
3193.8.17 by Aaron Bentley
Get directory rename handling working.
109
        self.assertEqual({'path3/path4': 'path4-id', 'path2': 'path2-id'},
110
                         matches)
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
111
112
    def test_guess_renames(self):
113
        tree = self.make_branch_and_tree('tree')
114
        tree.lock_write()
115
        self.addCleanup(tree.unlock)
116
        self.build_tree(['tree/file'])
6855.4.1 by Jelmer Vernooij
Yet more bees.
117
        tree.add('file', b'file-id')
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
118
        tree.commit('Added file')
119
        os.rename('tree/file', 'tree/file2')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
120
        RenameMap.guess_renames(tree.basis_tree(), tree)
6855.4.1 by Jelmer Vernooij
Yet more bees.
121
        self.assertEqual('file2', tree.id2path(b'file-id'))
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
122
123
    def test_guess_renames_handles_directories(self):
124
        tree = self.make_branch_and_tree('tree')
125
        tree.lock_write()
126
        self.addCleanup(tree.unlock)
127
        self.build_tree(['tree/dir/', 'tree/dir/file'])
6855.4.1 by Jelmer Vernooij
Yet more bees.
128
        tree.add(['dir', 'dir/file'], [b'dir-id', b'file-id'])
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
129
        tree.commit('Added file')
130
        os.rename('tree/dir', 'tree/dir2')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
131
        RenameMap.guess_renames(tree.basis_tree(), tree)
6855.4.1 by Jelmer Vernooij
Yet more bees.
132
        self.assertEqual('dir2/file', tree.id2path(b'file-id'))
133
        self.assertEqual('dir2', tree.id2path(b'dir-id'))
3193.8.21 by Aaron Bentley
Add support for guessing grandparents with nonzero files.
134
135
    def test_guess_renames_handles_grandparent_directories(self):
136
        tree = self.make_branch_and_tree('tree')
137
        tree.lock_write()
138
        self.addCleanup(tree.unlock)
139
        self.build_tree(['tree/topdir/',
140
                         'tree/topdir/middledir/',
141
                         'tree/topdir/middledir/file'])
142
        tree.add(['topdir', 'topdir/middledir', 'topdir/middledir/file'],
6855.4.1 by Jelmer Vernooij
Yet more bees.
143
                 [b'topdir-id', b'middledir-id', b'file-id'])
3193.8.21 by Aaron Bentley
Add support for guessing grandparents with nonzero files.
144
        tree.commit('Added files.')
145
        os.rename('tree/topdir', 'tree/topdir2')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
146
        RenameMap.guess_renames(tree.basis_tree(), tree)
6855.4.1 by Jelmer Vernooij
Yet more bees.
147
        self.assertEqual('topdir2', tree.id2path(b'topdir-id'))
3193.8.28 by Aaron Bentley
Add test for guessing renames.
148
149
    def test_guess_renames_preserves_children(self):
150
        """When a directory has been moved, its children are preserved."""
151
        tree = self.make_branch_and_tree('tree')
152
        tree.lock_write()
4327.1.6 by Vincent Ladeuil
Fix 1 more lock-related test failure.
153
        self.addCleanup(tree.unlock)
6855.4.1 by Jelmer Vernooij
Yet more bees.
154
        self.build_tree_contents([('tree/foo/', b''),
155
                                  ('tree/foo/bar', b'bar'),
156
                                  ('tree/foo/empty', b'')])
3193.8.28 by Aaron Bentley
Add test for guessing renames.
157
        tree.add(['foo', 'foo/bar', 'foo/empty'],
6855.4.1 by Jelmer Vernooij
Yet more bees.
158
                 [b'foo-id', b'bar-id', b'empty-id'])
3193.8.28 by Aaron Bentley
Add test for guessing renames.
159
        tree.commit('rev1')
160
        os.rename('tree/foo', 'tree/baz')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
161
        RenameMap.guess_renames(tree.basis_tree(), tree)
6855.4.1 by Jelmer Vernooij
Yet more bees.
162
        self.assertEqual('baz/empty', tree.id2path(b'empty-id'))
3193.8.34 by Aaron Bentley
Add tests of guess_renames output.
163
164
    def test_guess_renames_dry_run(self):
165
        tree = self.make_branch_and_tree('tree')
166
        tree.lock_write()
167
        self.addCleanup(tree.unlock)
168
        self.build_tree(['tree/file'])
6855.4.1 by Jelmer Vernooij
Yet more bees.
169
        tree.add('file', b'file-id')
3193.8.34 by Aaron Bentley
Add tests of guess_renames output.
170
        tree.commit('Added file')
171
        os.rename('tree/file', 'tree/file2')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
172
        RenameMap.guess_renames(tree.basis_tree(), tree, dry_run=True)
6855.4.1 by Jelmer Vernooij
Yet more bees.
173
        self.assertEqual('file', tree.id2path(b'file-id'))
3193.8.34 by Aaron Bentley
Add tests of guess_renames output.
174
175
    @staticmethod
176
    def captureNotes(cmd, *args, **kwargs):
177
        notes = []
178
        def my_note(fmt, *args):
179
            notes.append(fmt % args)
180
        old_note = trace.note
181
        trace.note = my_note
182
        try:
183
            result = cmd(*args, **kwargs)
184
        finally:
185
            trace.note = old_note
186
        return notes, result
187
188
    def test_guess_renames_output(self):
189
        """guess_renames emits output whether dry_run is True or False."""
190
        tree = self.make_branch_and_tree('tree')
191
        tree.lock_write()
192
        self.addCleanup(tree.unlock)
193
        self.build_tree(['tree/file'])
6855.4.1 by Jelmer Vernooij
Yet more bees.
194
        tree.add('file', b'file-id')
3193.8.34 by Aaron Bentley
Add tests of guess_renames output.
195
        tree.commit('Added file')
196
        os.rename('tree/file', 'tree/file2')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
197
        notes = self.captureNotes(
198
                RenameMap.guess_renames, tree.basis_tree(), tree,
199
                dry_run=True)[0]
3193.8.34 by Aaron Bentley
Add tests of guess_renames output.
200
        self.assertEqual('file => file2', ''.join(notes))
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
201
        notes = self.captureNotes(RenameMap.guess_renames, tree.basis_tree(),
202
                tree, dry_run=False)[0]
3193.8.34 by Aaron Bentley
Add tests of guess_renames output.
203
        self.assertEqual('file => file2', ''.join(notes))
6547.1.1 by mnn
Fixed issue with RenameMap - also it supports renaming into new unversioned directory
204
205
    def test_guess_rename_handles_new_directories(self):
206
        """When a file was moved into a new directory."""
6547.1.2 by mnn
Simplified test_guess_rename_handles_new_directories
207
        tree = self.make_branch_and_tree('.')
6547.1.1 by mnn
Fixed issue with RenameMap - also it supports renaming into new unversioned directory
208
        tree.lock_write()
209
        #self.addCleanup(tree.unlock)
6547.1.2 by mnn
Simplified test_guess_rename_handles_new_directories
210
        self.build_tree(['file'])
6855.4.1 by Jelmer Vernooij
Yet more bees.
211
        tree.add('file', b'file-id')
6547.1.1 by mnn
Fixed issue with RenameMap - also it supports renaming into new unversioned directory
212
        tree.commit('Added file')
6547.1.2 by mnn
Simplified test_guess_rename_handles_new_directories
213
        os.mkdir('folder')
214
        os.rename('file', 'folder/file2')
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
215
        notes = self.captureNotes(
216
                RenameMap.guess_renames, tree.basis_tree(), tree)[0]
6547.1.1 by mnn
Fixed issue with RenameMap - also it supports renaming into new unversioned directory
217
        self.assertEqual('file => folder/file2', ''.join(notes))
218
219
        tree.unlock()