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