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