/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.252 by Jelmer Vernooij
Clarify history, copyright.
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
0.200.228 by Jelmer Vernooij
Split out map.
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Map from Git sha's to Bazaar objects."""
18
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
19
from dulwich.objects import (
20
    Blob,
0.200.586 by Jelmer Vernooij
Fix issues pointed out by pyflakes.
21
    sha_to_hex,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
22
    )
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
23
from dulwich.object_store import (
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
24
    BaseObjectStore,
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
25
    )
0.200.249 by Jelmer Vernooij
Implement Tree.
26
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
27
from bzrlib import (
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
28
    debug,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
29
    errors,
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
30
    trace,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
31
    ui,
32
    )
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
33
from bzrlib.revision import (
34
    NULL_REVISION,
35
    )
0.200.228 by Jelmer Vernooij
Split out map.
36
0.200.229 by Jelmer Vernooij
More work on converter.
37
from bzrlib.plugins.git.mapping import (
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
38
    default_mapping,
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
39
    directory_to_tree,
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
40
    extract_unusual_modes,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
41
    mapping_registry,
0.200.229 by Jelmer Vernooij
More work on converter.
42
    revision_to_commit,
43
    )
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
44
from bzrlib.plugins.git.shamap import (
45
    SqliteGitShaMap,
0.200.476 by Jelmer Vernooij
Fix Tdb backend, use tdb if possible by default.
46
    TdbGitShaMap,
0.200.231 by Jelmer Vernooij
Partially fix pull.
47
    )
48
0.200.228 by Jelmer Vernooij
Split out map.
49
0.200.452 by Jelmer Vernooij
Rename converter -> object_store, provide utility function for getting ObjectStore's.
50
def get_object_store(repo, mapping=None):
51
    git = getattr(repo, "_git", None)
52
    if git is not None:
53
        return git.object_store
54
    return BazaarObjectStore(repo, mapping)
55
56
0.200.457 by Jelmer Vernooij
Use BaseObjectStore.
57
class BazaarObjectStore(BaseObjectStore):
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
58
    """A Git-style object store backed onto a Bazaar repository."""
0.200.228 by Jelmer Vernooij
Split out map.
59
60
    def __init__(self, repository, mapping=None):
61
        self.repository = repository
62
        if mapping is None:
0.200.463 by Jelmer Vernooij
Support remote dpush (except for references).
63
            self.mapping = default_mapping
0.200.228 by Jelmer Vernooij
Split out map.
64
        else:
65
            self.mapping = mapping
0.200.476 by Jelmer Vernooij
Fix Tdb backend, use tdb if possible by default.
66
        try:
67
            self._idmap = TdbGitShaMap.from_repository(repository)
68
        except ImportError:
69
            self._idmap = SqliteGitShaMap.from_repository(repository)
0.200.228 by Jelmer Vernooij
Split out map.
70
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
71
    def _update_sha_map(self, stop_revision=None):
72
        if stop_revision is None:
73
            all_revids = self.repository.all_revision_ids()
74
        else:
75
            all_revids = self.repository.get_ancestry(stop_revision)
76
            first = all_revids.pop(0) # Pop leading None
77
            assert first is None
0.200.231 by Jelmer Vernooij
Partially fix pull.
78
        graph = self.repository.get_graph()
0.200.230 by Jelmer Vernooij
Implement sha cache.
79
        present_revids = set(self._idmap.revids())
0.200.347 by Jelmer Vernooij
Simplify converter a bit.
80
        missing_revids = [revid for revid in graph.iter_topo_order(all_revids) if revid not in present_revids]
0.200.231 by Jelmer Vernooij
Partially fix pull.
81
        pb = ui.ui_factory.nested_progress_bar()
82
        try:
0.200.347 by Jelmer Vernooij
Simplify converter a bit.
83
            for i, revid in enumerate(missing_revids):
84
                pb.update("updating git map", i, len(missing_revids))
0.200.231 by Jelmer Vernooij
Partially fix pull.
85
                self._update_sha_map_revision(revid)
86
        finally:
0.200.232 by Jelmer Vernooij
Fix pull from remote branches.
87
            self._idmap.commit()
0.200.231 by Jelmer Vernooij
Partially fix pull.
88
            pb.finished()
0.200.229 by Jelmer Vernooij
More work on converter.
89
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
90
    def __iter__(self):
91
        self._update_sha_map()
92
        return iter(self._idmap.sha1s())
93
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
94
    def _revision_to_commit(self, rev, tree_sha):
95
        def parent_lookup(revid):
96
            try:
97
                return self._lookup_revision_sha1(revid)
98
            except errors.NoSuchRevision:
99
                trace.warning("Ignoring ghost parent %s", revid)
100
                return None
101
        return revision_to_commit(rev, tree_sha, parent_lookup)
102
0.200.229 by Jelmer Vernooij
More work on converter.
103
    def _update_sha_map_revision(self, revid):
104
        inv = self.repository.get_inventory(revid)
105
        rev = self.repository.get_revision(revid)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
106
        unusual_modes = extract_unusual_modes(rev)
107
        tree_sha = self._get_ie_sha1(inv.root, inv, unusual_modes)
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
108
        commit_obj = self._revision_to_commit(rev, tree_sha)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
109
        try:
110
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
111
        except errors.InvalidRevisionId:
112
            pass
113
        else:
114
            if foreign_revid != commit_obj.id:
0.200.440 by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well.
115
                if not "fix-shamap" in debug.debug_flags:
116
                    raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id))
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
117
        self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha))
0.200.229 by Jelmer Vernooij
More work on converter.
118
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
119
    def _check_expected_sha(self, expected_sha, object):
120
        if expected_sha is None:
121
            return
0.200.565 by Jelmer Vernooij
Cope with 'binary' shas.
122
        if len(expected_sha) == 40:
123
            if expected_sha != object.sha().hexdigest():
124
                raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
125
        elif len(expected_sha) == 20:
126
            if expected_sha != object.sha().digest():
127
                raise AssertionError("Invalid sha for %r: %s" % (object, sha_to_hex(expected_sha)))
128
        else:
129
            raise AssertionError("Unknown length %d for %r" % (len(expected_sha), expected_sha))
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
130
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
131
    def _get_ie_object(self, entry, inv, unusual_modes):  
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
132
        if entry.kind == "directory":
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
133
            return self._get_tree(entry.file_id, inv.revision_id, inv, unusual_modes)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
134
        else:
135
            return self._get_blob(entry.file_id, entry.revision)
136
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
137
    def _get_ie_object_or_sha1(self, entry, inv, unusual_modes):
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
138
        if entry.kind == "directory":
139
            try:
140
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
141
            except KeyError:
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
142
                ret = self._get_ie_object(entry, inv, unusual_modes)
0.200.593 by Jelmer Vernooij
Avoid writing empty trees.
143
                if ret is None:
144
                    hexsha = None
145
                else:
146
                    hexsha = ret.id
147
                self._idmap.add_entry(hexsha, "tree", (entry.file_id, inv.revision_id))
148
                return hexsha, ret
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
149
        else:
150
            try:
151
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
152
            except KeyError:
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
153
                ret = self._get_ie_object(entry, inv, unusual_modes)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
154
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
155
                return ret.id, ret
156
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
157
    def _get_ie_sha1(self, entry, inv, unusual_modes):
158
        return self._get_ie_object_or_sha1(entry, inv, unusual_modes)[0]
0.200.359 by Jelmer Vernooij
Simplify file mode handling, avoid inventory_to_tree_and_blobs as it is expensive if trees/blobs have already been converted.
159
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
160
    def _get_blob(self, fileid, revision, expected_sha=None):
0.200.236 by Jelmer Vernooij
require bzr 1.13.
161
        """Return a Git Blob object from a fileid and revision stored in bzr.
162
        
163
        :param fileid: File id of the text
164
        :param revision: Revision of the text
165
        """
0.200.632 by Jelmer Vernooij
Avoid accessing Repository.texts directly.
166
        chunks = self.repository.iter_files_bytes([(fileid, revision, None)]).next()[1]
0.200.229 by Jelmer Vernooij
More work on converter.
167
        blob = Blob()
0.200.632 by Jelmer Vernooij
Avoid accessing Repository.texts directly.
168
        blob._text = "".join(chunks)
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
169
        self._check_expected_sha(expected_sha, blob)
0.200.229 by Jelmer Vernooij
More work on converter.
170
        return blob
171
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
172
    def _get_tree(self, fileid, revid, inv, unusual_modes, expected_sha=None):
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
173
        """Return a Git Tree object from a file id and a revision stored in bzr.
0.200.249 by Jelmer Vernooij
Implement Tree.
174
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
175
        :param fileid: fileid in the tree.
0.200.249 by Jelmer Vernooij
Implement Tree.
176
        :param revision: Revision of the tree.
177
        """
0.200.549 by Jelmer Vernooij
Fix storing of unusual file modes.
178
        tree = directory_to_tree(inv[fileid], 
179
            lambda ie: self._get_ie_sha1(ie, inv, unusual_modes),
180
            unusual_modes)
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
181
        self._check_expected_sha(expected_sha, tree)
0.200.249 by Jelmer Vernooij
Implement Tree.
182
        return tree
0.200.229 by Jelmer Vernooij
More work on converter.
183
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
184
    def _get_commit(self, rev, tree_sha, expected_sha=None):
0.238.7 by Jelmer Vernooij
Cope with ghosts a bit better.
185
        commit = self._revision_to_commit(rev, tree_sha)
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
186
        self._check_expected_sha(expected_sha, commit)
187
        return commit
0.200.228 by Jelmer Vernooij
Split out map.
188
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
189
    def get_parents(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
190
        """Retrieve the parents of a Git commit by SHA1.
191
192
        :param sha: SHA1 of the commit
193
        :raises: KeyError, NotCommitError
194
        """
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
195
        return self[sha].parents
196
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
197
    def _lookup_revision_sha1(self, revid):
0.200.449 by Jelmer Vernooij
Use BazaarObjectStore to find matching SHA1s for bzr revisions.
198
        """Return the SHA1 matching a Bazaar revision."""
0.200.541 by Jelmer Vernooij
Cope with NULL_REVISION.
199
        if revid == NULL_REVISION:
200
            return "0" * 40
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
201
        try:
0.200.487 by Jelmer Vernooij
Prevent deep recursion if the shamap is out of date.
202
            return self._idmap.lookup_commit(revid)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
203
        except KeyError:
0.200.487 by Jelmer Vernooij
Prevent deep recursion if the shamap is out of date.
204
            self._update_sha_map(revid)
205
            return self._idmap.lookup_commit(revid)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
206
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
207
    def get_raw(self, sha):
0.200.454 by Jelmer Vernooij
Use ObjectStore.find_missing_objects in server.
208
        """Get the raw representation of a Git object by SHA1.
209
210
        :param sha: SHA1 of the git object
211
        """
0.200.566 by Jelmer Vernooij
Fix ObjectStore.get_raw() .
212
        obj = self[sha]
213
        return (obj.type, obj.as_raw_string())
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
214
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
215
    def __contains__(self, sha):
216
        # See if sha is in map
217
        try:
0.200.568 by Jelmer Vernooij
Properly check that matching bzr objects exist.
218
            (type, type_data) = self._lookup_git_sha(sha)
219
            if type == "commit":
220
                return self.repository.has_revision(type_data[0])
221
            elif type == "blob":
222
                return self.repository.texts.has_version(type_data)
223
            elif type == "tree":
224
                return self.repository.has_revision(type_data[1])
225
            else:
226
                raise AssertionError("Unknown object type '%s'" % type)
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
227
        except KeyError:
228
            return False
229
        else:
230
            return True
231
232
    def _lookup_git_sha(self, sha):
233
        # See if sha is in map
234
        try:
235
            return self._idmap.lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
236
        except KeyError:
237
            # if not, see if there are any unconverted revisions and add them 
238
            # to the map, search for sha in map again
239
            self._update_sha_map()
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
240
            return self._idmap.lookup_git_sha(sha)
241
242
    def __getitem__(self, sha):
243
        (type, type_data) = self._lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
244
        # convert object to git object
0.200.229 by Jelmer Vernooij
More work on converter.
245
        if type == "commit":
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
246
            try:
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
247
                rev = self.repository.get_revision(type_data[0])
0.200.478 by Jelmer Vernooij
Cope with disappeared revisions.
248
            except errors.NoSuchRevision:
249
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
250
                raise KeyError(sha)
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
251
            return self._get_commit(rev, type_data[1], expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
252
        elif type == "blob":
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
253
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
254
        elif type == "tree":
0.200.561 by Jelmer Vernooij
Cope with revisions pointed to by trees in the shamap disappearing.
255
            try:
256
                inv = self.repository.get_inventory(type_data[1])
257
                rev = self.repository.get_revision(type_data[1])
258
            except errors.NoSuchRevision:
259
                trace.mutter('entry for %s %s in shamap: %r, but not found in repository', type, sha, type_data)
260
                raise KeyError(sha)
0.200.556 by Jelmer Vernooij
Fix syntax error.
261
            unusual_modes = extract_unusual_modes(rev)
0.200.491 by Jelmer Vernooij
Cope with map for Tree objects becoming invalid.
262
            try:
0.200.548 by Jelmer Vernooij
Extract unusual file modes from revision when reconstructing Trees.
263
                return self._get_tree(type_data[0], type_data[1], inv, unusual_modes,
0.200.491 by Jelmer Vernooij
Cope with map for Tree objects becoming invalid.
264
                                      expected_sha=sha)
265
            except errors.NoSuchRevision:
266
                raise KeyError(sha)
0.200.228 by Jelmer Vernooij
Split out map.
267
        else:
268
            raise AssertionError("Unknown object type '%s'" % type)