/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,
21
    Tree,
22
    )
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
23
from dulwich.object_store import (
24
    ObjectStoreIterator,
25
    )
0.200.249 by Jelmer Vernooij
Implement Tree.
26
import stat
27
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
28
from bzrlib import (
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
29
    errors,
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
30
    ui,
31
    )
0.200.228 by Jelmer Vernooij
Split out map.
32
0.200.229 by Jelmer Vernooij
More work on converter.
33
from bzrlib.plugins.git.mapping import (
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.
34
    directory_to_tree,
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
35
    mapping_registry,
0.200.229 by Jelmer Vernooij
More work on converter.
36
    revision_to_commit,
37
    )
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
38
from bzrlib.plugins.git.shamap import (
39
    SqliteGitShaMap,
0.200.231 by Jelmer Vernooij
Partially fix pull.
40
    )
41
0.200.228 by Jelmer Vernooij
Split out map.
42
0.200.320 by Jelmer Vernooij
Handle lightweight checkouts.
43
class BazaarObjectStore(object):
44
    """A Git-style object store backed onto a Bazaar repository."""
0.200.228 by Jelmer Vernooij
Split out map.
45
46
    def __init__(self, repository, mapping=None):
47
        self.repository = repository
48
        if mapping is None:
49
            self.mapping = self.repository.get_mapping()
50
        else:
51
            self.mapping = mapping
0.200.365 by Jelmer Vernooij
Share sha map cache connections inside threads.
52
        self._idmap = SqliteGitShaMap.from_repository(repository)
0.200.228 by Jelmer Vernooij
Split out map.
53
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
54
    def iter_shas(self, shas):
55
        return ObjectStoreIterator(self, shas)
56
57
    def _update_sha_map(self, stop_revision=None):
58
        if stop_revision is None:
59
            all_revids = self.repository.all_revision_ids()
60
        else:
61
            all_revids = self.repository.get_ancestry(stop_revision)
62
            first = all_revids.pop(0) # Pop leading None
63
            assert first is None
0.200.231 by Jelmer Vernooij
Partially fix pull.
64
        graph = self.repository.get_graph()
0.200.230 by Jelmer Vernooij
Implement sha cache.
65
        present_revids = set(self._idmap.revids())
0.200.347 by Jelmer Vernooij
Simplify converter a bit.
66
        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.
67
        pb = ui.ui_factory.nested_progress_bar()
68
        try:
0.200.347 by Jelmer Vernooij
Simplify converter a bit.
69
            for i, revid in enumerate(missing_revids):
70
                pb.update("updating git map", i, len(missing_revids))
0.200.231 by Jelmer Vernooij
Partially fix pull.
71
                self._update_sha_map_revision(revid)
72
        finally:
0.200.232 by Jelmer Vernooij
Fix pull from remote branches.
73
            self._idmap.commit()
0.200.231 by Jelmer Vernooij
Partially fix pull.
74
            pb.finished()
0.200.229 by Jelmer Vernooij
More work on converter.
75
0.200.422 by Jelmer Vernooij
'bzr git-object' without arguments now prints the available git objects.
76
    def __iter__(self):
77
        self._update_sha_map()
78
        return iter(self._idmap.sha1s())
79
0.200.229 by Jelmer Vernooij
More work on converter.
80
    def _update_sha_map_revision(self, revid):
81
        inv = self.repository.get_inventory(revid)
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.
82
        tree_sha = self._get_ie_sha1(inv.root, inv)
0.200.229 by Jelmer Vernooij
More work on converter.
83
        rev = self.repository.get_revision(revid)
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
84
        commit_obj = revision_to_commit(rev, tree_sha,
85
            self._idmap._parent_lookup)
0.231.1 by Jelmer Vernooij
Check that regenerated objects have the expected sha1.
86
        try:
87
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
88
        except errors.InvalidRevisionId:
89
            pass
90
        else:
91
            if foreign_revid != commit_obj.id:
92
                raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id))
93
        self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha))
0.200.229 by Jelmer Vernooij
More work on converter.
94
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
95
    def _check_expected_sha(self, expected_sha, object):
96
        if expected_sha is None:
97
            return
98
        if expected_sha != object.id:
99
            raise AssertionError("Invalid sha for %r: %s" % (object, expected_sha))
100
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
101
    def _get_ie_object(self, entry, inv):  
102
        if entry.kind == "directory":
103
            return self._get_tree(entry.file_id, inv.revision_id, inv=inv)
104
        else:
105
            return self._get_blob(entry.file_id, entry.revision)
106
107
    def _get_ie_object_or_sha1(self, entry, inv):
108
        if entry.kind == "directory":
109
            try:
110
                return self._idmap.lookup_tree(entry.file_id, inv.revision_id), None
111
            except KeyError:
112
                ret = self._get_ie_object(entry, inv)
113
                self._idmap.add_entry(ret.id, "tree", (entry.file_id, inv.revision_id))
114
                return ret.id, ret
115
        else:
116
            try:
117
                return self._idmap.lookup_blob(entry.file_id, entry.revision), None
118
            except KeyError:
119
                ret = self._get_ie_object(entry, inv)
120
                self._idmap.add_entry(ret.id, "blob", (entry.file_id, entry.revision))
121
                return ret.id, ret
122
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.
123
    def _get_ie_sha1(self, entry, inv):
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
124
        return self._get_ie_object_or_sha1(entry, inv)[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.
125
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
126
    def _get_blob(self, fileid, revision, expected_sha=None):
0.200.236 by Jelmer Vernooij
require bzr 1.13.
127
        """Return a Git Blob object from a fileid and revision stored in bzr.
128
        
129
        :param fileid: File id of the text
130
        :param revision: Revision of the text
131
        """
0.200.260 by Jelmer Vernooij
Add DictGitShaMap, useful for testing.
132
        text = self.repository.texts.get_record_stream([(fileid, revision)],
133
            "unordered", True).next().get_bytes_as("fulltext")
0.200.229 by Jelmer Vernooij
More work on converter.
134
        blob = Blob()
135
        blob._text = text
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
136
        self._check_expected_sha(expected_sha, blob)
0.200.229 by Jelmer Vernooij
More work on converter.
137
        return blob
138
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
139
    def _get_tree(self, fileid, revid, inv=None, expected_sha=None):
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
140
        """Return a Git Tree object from a file id and a revision stored in bzr.
0.200.249 by Jelmer Vernooij
Implement Tree.
141
0.200.343 by Jelmer Vernooij
Use file ids consistently in map.
142
        :param fileid: fileid in the tree.
0.200.249 by Jelmer Vernooij
Implement Tree.
143
        :param revision: Revision of the tree.
144
        """
145
        if inv is None:
146
            inv = self.repository.get_inventory(revid)
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.
147
        tree = directory_to_tree(inv[fileid], lambda ie: self._get_ie_sha1(ie, inv))
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
148
        self._check_expected_sha(expected_sha, tree)
0.200.249 by Jelmer Vernooij
Implement Tree.
149
        return tree
0.200.229 by Jelmer Vernooij
More work on converter.
150
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
151
    def _get_commit(self, revid, tree_sha, expected_sha=None):
0.200.229 by Jelmer Vernooij
More work on converter.
152
        rev = self.repository.get_revision(revid)
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
153
        commit = revision_to_commit(rev, tree_sha, self._lookup_revision_sha1)
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
154
        self._check_expected_sha(expected_sha, commit)
155
        return commit
0.200.228 by Jelmer Vernooij
Split out map.
156
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
157
    def get_parents(self, sha):
158
        return self[sha].parents
159
0.200.364 by Jelmer Vernooij
Reimplement dpush, but more efficient and only writing a single pack file rather than one per revision.
160
    def _lookup_revision_sha1(self, revid):
161
        try:
162
            return self._idmap._parent_lookup(revid)
163
        except KeyError:
164
            inv = self.repository.get_inventory(revid)
165
            tree_sha = self._get_ie_sha1(inv.root, inv)
166
            ret = self._get_commit(revid, tree_sha).id
167
            self._idmap.add_entry(ret, "commit", (revid, tree_sha))
168
            return ret
169
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
170
    def get_raw(self, sha):
0.200.421 by Jelmer Vernooij
Use public method to access raw git object text.
171
        return self[sha].as_raw_string()
0.200.310 by Jelmer Vernooij
Fix pull from remote branches.
172
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
173
    def __contains__(self, sha):
174
        # See if sha is in map
175
        try:
176
            self._lookup_git_sha(sha)
177
        except KeyError:
178
            return False
179
        else:
180
            return True
181
182
    def _lookup_git_sha(self, sha):
183
        # See if sha is in map
184
        try:
185
            return self._idmap.lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
186
        except KeyError:
187
            # if not, see if there are any unconverted revisions and add them 
188
            # to the map, search for sha in map again
189
            self._update_sha_map()
0.200.437 by Jelmer Vernooij
Implement BazaarObjectStore.__contains__, BazaarObjectStore.iter_shas, BazaarObjectStore.get_parents.
190
            return self._idmap.lookup_git_sha(sha)
191
192
    def __getitem__(self, sha):
193
        (type, type_data) = self._lookup_git_sha(sha)
0.200.228 by Jelmer Vernooij
Split out map.
194
        # convert object to git object
0.200.229 by Jelmer Vernooij
More work on converter.
195
        if type == "commit":
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
196
            return self._get_commit(type_data[0], type_data[1], 
197
                                    expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
198
        elif type == "blob":
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
199
            return self._get_blob(type_data[0], type_data[1], expected_sha=sha)
0.200.229 by Jelmer Vernooij
More work on converter.
200
        elif type == "tree":
0.200.353 by Jelmer Vernooij
fileids/revids are plain strings, not unicode
201
            return self._get_tree(type_data[0], type_data[1], expected_sha=sha)
0.200.228 by Jelmer Vernooij
Split out map.
202
        else:
203
            raise AssertionError("Unknown object type '%s'" % type)