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