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