/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
3193.8.4 by Aaron Bentley
Get rename detection working for files.
20
from bzrlib.rename_map import RenameMap
21
from bzrlib.tests import TestCaseWithTransport
22
3193.8.8 by Aaron Bentley
Get tests passing.
23
24
def myhash(val):
25
    """This the hash used by RenameMap."""
3193.8.10 by Aaron Bentley
Update to weight hits and use 10M of keyspace
26
    return hash(val) % (1024 * 1024 * 10)
3193.8.8 by Aaron Bentley
Get tests passing.
27
28
3193.8.4 by Aaron Bentley
Get rename detection working for files.
29
class TestRenameMap(TestCaseWithTransport):
30
31
    a_lines = 'a\nb\nc\n'.splitlines(True)
32
    b_lines = 'b\nc\nd\n'.splitlines(True)
33
34
35
    def test_add_edge_hashes(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
36
        rn = RenameMap(None)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
37
        rn.add_edge_hashes(self.a_lines, 'a')
3193.8.8 by Aaron Bentley
Get tests passing.
38
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('a\n', 'b\n'))])
39
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('b\n', 'c\n'))])
40
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
3193.8.4 by Aaron Bentley
Get rename detection working for files.
41
42
    def test_add_file_edge_hashes(self):
43
        tree = self.make_branch_and_tree('tree')
44
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
45
        tree.add('a', 'a')
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
46
        rn = RenameMap(tree)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
47
        rn.add_file_edge_hashes(tree, ['a'])
3193.8.8 by Aaron Bentley
Get tests passing.
48
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('a\n', 'b\n'))])
49
        self.assertEqual(set(['a']), rn.edge_hashes[myhash(('b\n', 'c\n'))])
50
        self.assertIs(None, rn.edge_hashes.get(myhash(('c\n', 'd\n'))))
3193.8.4 by Aaron Bentley
Get rename detection working for files.
51
52
    def test_hitcounts(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
53
        rn = RenameMap(None)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
54
        rn.add_edge_hashes(self.a_lines, 'a')
55
        rn.add_edge_hashes(self.b_lines, 'b')
3193.8.10 by Aaron Bentley
Update to weight hits and use 10M of keyspace
56
        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.
57
        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
58
        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.
59
60
    def test_file_match(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
61
        tree = self.make_branch_and_tree('tree')
62
        rn = RenameMap(tree)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
63
        rn.add_edge_hashes(self.a_lines, 'aid')
64
        rn.add_edge_hashes(self.b_lines, 'bid')
65
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
66
        self.build_tree_contents([('tree/b', ''.join(self.b_lines))])
67
        self.assertEqual({'a': 'aid', 'b': 'bid'},
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
68
                         rn.file_match(['a', 'b']))
3193.8.5 by Aaron Bentley
Improve rename detection
69
70
    def test_file_match_no_dups(self):
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
71
        tree = self.make_branch_and_tree('tree')
72
        rn = RenameMap(tree)
3193.8.5 by Aaron Bentley
Improve rename detection
73
        rn.add_edge_hashes(self.a_lines, 'aid')
74
        self.build_tree_contents([('tree/a', ''.join(self.a_lines))])
75
        self.build_tree_contents([('tree/b', ''.join(self.b_lines))])
76
        self.build_tree_contents([('tree/c', ''.join(self.b_lines))])
77
        self.assertEqual({'a': 'aid'},
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
78
                         rn.file_match(['a', 'b', 'c']))
3193.8.16 by Aaron Bentley
Get a dict of required parents.
79
80
    def test_match_directories(self):
81
        tree = self.make_branch_and_tree('tree')
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
82
        rn = RenameMap(tree)
3193.8.16 by Aaron Bentley
Get a dict of required parents.
83
        required_parents = rn.get_required_parents({
84
            'path1': 'a',
85
            'path2/tr': 'b',
3193.8.17 by Aaron Bentley
Get directory rename handling working.
86
            'path3/path4/path5': 'c',
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
87
        })
3193.8.17 by Aaron Bentley
Get directory rename handling working.
88
        self.assertEqual(
89
            {'path2': set(['b']), 'path3/path4': set(['c']), 'path3': set()},
90
            required_parents)
91
92
    def test_find_directory_renames(self):
93
        tree = self.make_branch_and_tree('tree')
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
94
        rn = RenameMap(tree)
3193.8.17 by Aaron Bentley
Get directory rename handling working.
95
        matches = {
96
            'path1': 'a',
97
            'path3/path4/path5': 'c',
98
        }
99
        required_parents = {
100
            'path2': set(['b']),
101
            'path3/path4': set(['c']),
102
            'path3': set([])}
103
        missing_parents = {
104
            'path2-id': set(['b']),
105
            'path4-id': set(['c']),
106
            'path3-id': set(['path4-id'])}
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
107
        matches = rn.match_parents(required_parents, missing_parents)
3193.8.17 by Aaron Bentley
Get directory rename handling working.
108
        self.assertEqual({'path3/path4': 'path4-id', 'path2': 'path2-id'},
109
                         matches)
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
110
111
    def test_guess_renames(self):
112
        tree = self.make_branch_and_tree('tree')
113
        tree.lock_write()
114
        self.addCleanup(tree.unlock)
115
        self.build_tree(['tree/file'])
116
        tree.add('file', 'file-id')
117
        tree.commit('Added file')
118
        os.rename('tree/file', 'tree/file2')
119
        RenameMap.guess_renames(tree)
120
        self.assertEqual('file2', tree.id2path('file-id'))
121
122
    def test_guess_renames_handles_directories(self):
123
        tree = self.make_branch_and_tree('tree')
124
        tree.lock_write()
125
        self.addCleanup(tree.unlock)
126
        self.build_tree(['tree/dir/', 'tree/dir/file'])
127
        tree.add(['dir', 'dir/file'], ['dir-id', 'file-id'])
128
        tree.commit('Added file')
129
        os.rename('tree/dir', 'tree/dir2')
130
        RenameMap.guess_renames(tree)
131
        self.assertEqual('dir2/file', tree.id2path('file-id'))
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
132
        self.assertEqual('dir2', tree.id2path('dir-id'))
3193.8.21 by Aaron Bentley
Add support for guessing grandparents with nonzero files.
133
134
    def test_guess_renames_handles_grandparent_directories(self):
135
        tree = self.make_branch_and_tree('tree')
136
        tree.lock_write()
137
        self.addCleanup(tree.unlock)
138
        self.build_tree(['tree/topdir/',
139
                         'tree/topdir/middledir/',
140
                         'tree/topdir/middledir/file'])
141
        tree.add(['topdir', 'topdir/middledir', 'topdir/middledir/file'],
142
                 ['topdir-id', 'middledir-id', 'file-id'])
143
        tree.commit('Added files.')
144
        os.rename('tree/topdir', 'tree/topdir2')
145
        RenameMap.guess_renames(tree)
146
        self.assertEqual('topdir2', tree.id2path('topdir-id'))
3193.8.28 by Aaron Bentley
Add test for guessing renames.
147
148
    def test_guess_renames_preserves_children(self):
149
        """When a directory has been moved, its children are preserved."""
150
        tree = self.make_branch_and_tree('tree')
151
        tree.lock_write()
152
        self.build_tree_contents([('tree/foo/', ''),
153
                                  ('tree/foo/bar', 'bar'),
154
                                  ('tree/foo/empty', '')])
155
        tree.add(['foo', 'foo/bar', 'foo/empty'],
156
                 ['foo-id', 'bar-id', 'empty-id'])
157
        tree.commit('rev1')
158
        os.rename('tree/foo', 'tree/baz')
159
        RenameMap.guess_renames(tree)
160
        self.assertEqual('baz/empty', tree.id2path('empty-id'))