/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
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
3193.8.13 by Aaron Bentley
Update texts
18
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
19
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
20
from . import (
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
21
    osutils,
22
    progress,
3193.8.33 by Aaron Bentley
Add output, emit minimal inventory delta.
23
    trace,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
24
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
25
from .i18n import gettext
26
from .sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
27
    BytesIO,
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
28
    viewitems,
6885.5.9 by Jelmer Vernooij
Remove specific_file_ids support from Tree.iter_entries_by_dir.
29
    viewvalues,
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
30
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
31
from .ui import ui_factory
3193.8.4 by Aaron Bentley
Get rename detection working for files.
32
7143.15.2 by Jelmer Vernooij
Run autopep8.
33
3193.8.4 by Aaron Bentley
Get rename detection working for files.
34
class RenameMap(object):
3193.8.13 by Aaron Bentley
Update texts
35
    """Determine a mapping of renames."""
3193.8.4 by Aaron Bentley
Get rename detection working for files.
36
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
37
    def __init__(self, tree):
38
        self.tree = tree
3193.8.4 by Aaron Bentley
Get rename detection working for files.
39
        self.edge_hashes = {}
40
3193.8.11 by Aaron Bentley
Make hash iterator static
41
    @staticmethod
42
    def iter_edge_hashes(lines):
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
43
        """Iterate through the hashes of line pairs (which make up an edge).
44
45
        The hash is truncated using a modulus to avoid excessive memory
46
        consumption by the hitscount dict.  A modulus of 10Mi means that the
47
        maximum number of keys is 10Mi.  (Keys are normally 32 bits, e.g.
48
        4 Gi)
49
        """
3193.8.10 by Aaron Bentley
Update to weight hits and use 10M of keyspace
50
        modulus = 1024 * 1024 * 10
3193.8.4 by Aaron Bentley
Get rename detection working for files.
51
        for n in range(len(lines)):
7143.15.2 by Jelmer Vernooij
Run autopep8.
52
            yield hash(tuple(lines[n:n + 2])) % modulus
3193.8.4 by Aaron Bentley
Get rename detection working for files.
53
54
    def add_edge_hashes(self, lines, tag):
3193.8.13 by Aaron Bentley
Update texts
55
        """Update edge_hashes to include the given lines.
56
57
        :param lines: The lines to update the hashes for.
58
        :param tag: A tag uniquely associated with these lines (i.e. file-id)
59
        """
3193.8.4 by Aaron Bentley
Get rename detection working for files.
60
        for my_hash in self.iter_edge_hashes(lines):
61
            self.edge_hashes.setdefault(my_hash, set()).add(tag)
62
63
    def add_file_edge_hashes(self, tree, file_ids):
3193.8.13 by Aaron Bentley
Update texts
64
        """Update to reflect the hashes for files in the tree.
65
66
        :param tree: The tree containing the files.
67
        :param file_ids: A list of file_ids to perform the updates for.
68
        """
6874.2.1 by Jelmer Vernooij
Make Tree.iter_files_bytes() take paths rather than file_ids.
69
        desired_files = [(tree.id2path(f), f) for f in file_ids]
6861.4.1 by Jelmer Vernooij
Make progress bars context managers.
70
        with ui_factory.nested_progress_bar() as task:
3193.8.14 by Aaron Bentley
Add progress reporting to guess-renames
71
            for num, (file_id, contents) in enumerate(
7143.15.2 by Jelmer Vernooij
Run autopep8.
72
                    tree.iter_files_bytes(desired_files)):
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
73
                task.update(gettext('Calculating hashes'), num, len(file_ids))
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
74
                s = BytesIO()
3193.8.14 by Aaron Bentley
Add progress reporting to guess-renames
75
                s.writelines(contents)
76
                s.seek(0)
77
                self.add_edge_hashes(s.readlines(), file_id)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
78
79
    def hitcounts(self, lines):
3193.8.13 by Aaron Bentley
Update texts
80
        """Count the number of hash hits for each tag, for the given lines.
81
82
        Hits are weighted according to the number of tags the hash is
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
83
        associated with; more tags means that the hash is less rare and should
84
        tend to be ignored.
3193.8.13 by Aaron Bentley
Update texts
85
        :param lines: The lines to calculate hashes of.
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
86
        :return: a dict of {tag: hitcount}
3193.8.13 by Aaron Bentley
Update texts
87
        """
3193.8.4 by Aaron Bentley
Get rename detection working for files.
88
        hits = {}
89
        for my_hash in self.iter_edge_hashes(lines):
90
            tags = self.edge_hashes.get(my_hash)
91
            if tags is None:
92
                continue
3193.8.12 by Aaron Bentley
Reorganize slightly for the benefit of kcachegrind
93
            taglen = len(tags)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
94
            for tag in tags:
95
                if tag not in hits:
96
                    hits[tag] = 0
3193.8.12 by Aaron Bentley
Reorganize slightly for the benefit of kcachegrind
97
                hits[tag] += 1.0 / taglen
3193.8.4 by Aaron Bentley
Get rename detection working for files.
98
        return hits
99
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
100
    def get_all_hits(self, paths):
101
        """Find all the hit counts for the listed paths in the tree.
3193.8.13 by Aaron Bentley
Update texts
102
103
        :return: A list of tuples of count, path, file_id.
104
        """
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
105
        all_hits = []
6861.4.1 by Jelmer Vernooij
Make progress bars context managers.
106
        with ui_factory.nested_progress_bar() as task:
3193.8.14 by Aaron Bentley
Add progress reporting to guess-renames
107
            for num, path in enumerate(paths):
6138.4.1 by Jonathan Riddell
add gettext to progress bar strings
108
                task.update(gettext('Determining hash hits'), num, len(paths))
6809.4.5 by Jelmer Vernooij
Swap arguments for get_file_*.
109
                hits = self.hitcounts(self.tree.get_file_lines(path))
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
110
                all_hits.extend((v, path, k) for k, v in viewitems(hits))
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
111
        return all_hits
3193.8.12 by Aaron Bentley
Reorganize slightly for the benefit of kcachegrind
112
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
113
    def file_match(self, paths):
3193.8.13 by Aaron Bentley
Update texts
114
        """Return a mapping from file_ids to the supplied paths."""
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
115
        return self._match_hits(self.get_all_hits(paths))
3193.8.17 by Aaron Bentley
Get directory rename handling working.
116
117
    @staticmethod
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
118
    def _match_hits(hit_list):
3193.8.26 by Aaron Bentley
Updates from review.
119
        """Using a hit list, determine a path-to-fileid map.
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
120
121
        The hit list is a list of (count, path, file_id), where count is a
122
        (possibly float) number, with higher numbers indicating stronger
123
        matches.
124
        """
3193.8.12 by Aaron Bentley
Reorganize slightly for the benefit of kcachegrind
125
        seen_file_ids = set()
126
        path_map = {}
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
127
        for count, path, file_id in sorted(hit_list, reverse=True):
3193.8.26 by Aaron Bentley
Updates from review.
128
            if path in path_map or file_id in seen_file_ids:
3193.8.7 by Aaron Bentley
Saner algorithm for picking optimal file.
129
                continue
130
            path_map[path] = file_id
131
            seen_file_ids.add(file_id)
3193.8.4 by Aaron Bentley
Get rename detection working for files.
132
        return path_map
3193.8.16 by Aaron Bentley
Get a dict of required parents.
133
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
134
    def get_required_parents(self, matches):
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
135
        """Return a dict of all file parents that must be versioned.
136
137
        The keys are the required parents and the values are sets of their
138
        children.
139
        """
3193.8.16 by Aaron Bentley
Get a dict of required parents.
140
        required_parents = {}
141
        for path in matches:
142
            while True:
143
                child = path
144
                path = osutils.dirname(path)
6852.3.1 by Jelmer Vernooij
add Tree.is_versioned.
145
                if self.tree.is_versioned(path):
3193.8.16 by Aaron Bentley
Get a dict of required parents.
146
                    break
147
                required_parents.setdefault(path, []).append(child)
3193.8.17 by Aaron Bentley
Get directory rename handling working.
148
        require_ids = {}
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
149
        for parent, children in viewitems(required_parents):
3193.8.17 by Aaron Bentley
Get directory rename handling working.
150
            child_file_ids = set()
151
            for child in children:
152
                file_id = matches.get(child)
153
                if file_id is not None:
154
                    child_file_ids.add(file_id)
155
            require_ids[parent] = child_file_ids
156
        return require_ids
157
158
    def match_parents(self, required_parents, missing_parents):
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
159
        """Map parent directories to file-ids.
160
161
        This is done by finding similarity between the file-ids of children of
162
        required parent directories and the file-ids of children of missing
163
        parent directories.
164
        """
165
        all_hits = []
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
166
        for file_id, file_id_children in viewitems(missing_parents):
167
            for path, path_children in viewitems(required_parents):
3193.8.17 by Aaron Bentley
Get directory rename handling working.
168
                hits = len(path_children.intersection(file_id_children))
169
                if hits > 0:
3193.8.20 by Aaron Bentley
Cleanup and enhance tests.
170
                    all_hits.append((hits, path, file_id))
171
        return self._match_hits(all_hits)
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
172
3193.8.24 by Aaron Bentley
Use tree member instead of passing it in
173
    def _find_missing_files(self, basis):
3193.8.22 by Aaron Bentley
Reduce unnecessary locking.
174
        missing_files = set()
175
        missing_parents = {}
176
        candidate_files = set()
6861.4.1 by Jelmer Vernooij
Make progress bars context managers.
177
        with ui_factory.nested_progress_bar() as task:
178
            iterator = self.tree.iter_changes(basis, want_unversioned=True,
179
                                              pb=task)
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
180
            for change in iterator:
181
                if change.kind[1] is None and change.versioned[1]:
182
                    if not self.tree.has_filename(
183
                            self.tree.id2path(change.parent_id[0])):
7143.15.2 by Jelmer Vernooij
Run autopep8.
184
                        missing_parents.setdefault(
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
185
                            change.parent_id[0], set()).add(change.file_id)
186
                    if change.kind[0] == 'file':
187
                        missing_files.add(change.file_id)
3193.8.25 by Aaron Bentley
Improve progress reporting.
188
                    else:
7143.15.2 by Jelmer Vernooij
Run autopep8.
189
                        # other kinds are not handled
3193.8.25 by Aaron Bentley
Improve progress reporting.
190
                        pass
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
191
                if change.versioned == (False, False):
192
                    if self.tree.is_ignored(change.path[1]):
3193.8.25 by Aaron Bentley
Improve progress reporting.
193
                        continue
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
194
                    if change.kind[1] == 'file':
195
                        candidate_files.add(change.path[1])
196
                    if change.kind[1] == 'directory':
197
                        for _dir, children in self.tree.walkdirs(change.path[1]):
3193.8.25 by Aaron Bentley
Improve progress reporting.
198
                            for child in children:
199
                                if child[2] == 'file':
200
                                    candidate_files.add(child[0])
3193.8.22 by Aaron Bentley
Reduce unnecessary locking.
201
        return missing_files, missing_parents, candidate_files
202
203
    @classmethod
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
204
    def guess_renames(klass, from_tree, to_tree, dry_run=False):
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
205
        """Guess which files to rename, and perform the rename.
206
207
        We assume that unversioned files and missing files indicate that
208
        versioned files have been renamed outside of Bazaar.
3193.8.26 by Aaron Bentley
Updates from review.
209
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
210
        :param from_tree: A tree to compare from
211
        :param to_tree: A write-locked working tree.
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
212
        """
3193.8.22 by Aaron Bentley
Reduce unnecessary locking.
213
        required_parents = {}
6861.4.1 by Jelmer Vernooij
Make progress bars context managers.
214
        with ui_factory.nested_progress_bar() as task:
3193.8.25 by Aaron Bentley
Improve progress reporting.
215
            pp = progress.ProgressPhase('Guessing renames', 4, task)
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
216
            with from_tree.lock_read():
217
                rn = klass(to_tree)
3193.8.25 by Aaron Bentley
Improve progress reporting.
218
                pp.next_phase()
219
                missing_files, missing_parents, candidate_files = (
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
220
                    rn._find_missing_files(from_tree))
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
221
                pp.next_phase()
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
222
                rn.add_file_edge_hashes(from_tree, missing_files)
3193.8.25 by Aaron Bentley
Improve progress reporting.
223
            pp.next_phase()
224
            matches = rn.file_match(candidate_files)
225
            parents_matches = matches
226
            while len(parents_matches) > 0:
227
                required_parents = rn.get_required_parents(
228
                    parents_matches)
229
                parents_matches = rn.match_parents(required_parents,
230
                                                   missing_parents)
231
                matches.update(parents_matches)
232
            pp.next_phase()
3193.8.33 by Aaron Bentley
Add output, emit minimal inventory delta.
233
            delta = rn._make_inventory_delta(matches)
234
            for old, new, file_id, entry in delta:
7143.15.2 by Jelmer Vernooij
Run autopep8.
235
                trace.note(gettext("{0} => {1}").format(old, new))
3193.8.33 by Aaron Bentley
Add output, emit minimal inventory delta.
236
            if not dry_run:
6883.5.1 by Jelmer Vernooij
Add from_tree argument to RenameMap.guess_renames.
237
                to_tree.add(required_parents)
238
                to_tree.apply_inventory_delta(delta)
3193.8.23 by Aaron Bentley
Split up guess_renames further.
239
3193.8.33 by Aaron Bentley
Add output, emit minimal inventory delta.
240
    def _make_inventory_delta(self, matches):
3193.8.27 by Aaron Bentley
Use apply_inventory_delta to rename files.
241
        delta = []
6656.1.1 by Martin
Apply 2to3 dict fixer and clean up resulting mess using view helpers
242
        file_id_matches = dict((f, p) for p, f in viewitems(matches))
6885.5.9 by Jelmer Vernooij
Remove specific_file_ids support from Tree.iter_entries_by_dir.
243
        file_id_query = []
244
        for f in viewvalues(matches):
245
            try:
246
                file_id_query.append(self.tree.id2path(f))
247
            except errors.NoSuchId:
248
                pass
6885.6.1 by Jelmer Vernooij
Support specific_files argument to Tree.iter_entries_by_dir.
249
        for old_path, entry in self.tree.iter_entries_by_dir(
6885.5.9 by Jelmer Vernooij
Remove specific_file_ids support from Tree.iter_entries_by_dir.
250
                specific_files=file_id_query):
3193.8.27 by Aaron Bentley
Use apply_inventory_delta to rename files.
251
            new_path = file_id_matches[entry.file_id]
3193.8.29 by Aaron Bentley
Use split instead of basename/dirname
252
            parent_path, new_name = osutils.split(new_path)
3193.8.27 by Aaron Bentley
Use apply_inventory_delta to rename files.
253
            parent_id = matches.get(parent_path)
254
            if parent_id is None:
255
                parent_id = self.tree.path2id(parent_path)
6547.1.1 by mnn
Fixed issue with RenameMap - also it supports renaming into new unversioned directory
256
                if parent_id is None:
7143.15.2 by Jelmer Vernooij
Run autopep8.
257
                    added, ignored = self.tree.smart_add(
258
                        [parent_path], recurse=False)
6547.1.1 by mnn
Fixed issue with RenameMap - also it supports renaming into new unversioned directory
259
                    if len(ignored) > 0 and ignored[0] == parent_path:
260
                        continue
261
                    else:
262
                        parent_id = self.tree.path2id(parent_path)
3193.8.33 by Aaron Bentley
Add output, emit minimal inventory delta.
263
            if entry.name == new_name and entry.parent_id == parent_id:
264
                continue
3193.8.27 by Aaron Bentley
Use apply_inventory_delta to rename files.
265
            new_entry = entry.copy()
266
            new_entry.parent_id = parent_id
3193.8.29 by Aaron Bentley
Use split instead of basename/dirname
267
            new_entry.name = new_name
3193.8.27 by Aaron Bentley
Use apply_inventory_delta to rename files.
268
            delta.append((old_path, new_path, new_entry.file_id, new_entry))
3193.8.33 by Aaron Bentley
Add output, emit minimal inventory delta.
269
        return delta