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