/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to converter.py

Add description of git-v1 mapping.

Show diffs side-by-side

added added

removed removed

Lines of Context:
converter.py
1
 
# Copyright (C) 2009 Canonical Ltd
 
1
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Map from Git sha's to Bazaar objects."""
18
18
 
19
 
import bzrlib
20
 
 
21
 
from bzrlib import ui
22
 
 
23
 
from bzrlib.errors import NoSuchRevision
 
19
from dulwich.objects import (
 
20
    Blob,
 
21
    Tree,
 
22
    )
 
23
import stat
 
24
 
 
25
from bzrlib import (
 
26
    errors,
 
27
    ui,
 
28
    )
24
29
 
25
30
from bzrlib.plugins.git.mapping import (
26
31
    inventory_to_tree_and_blobs,
 
32
    mapping_registry,
27
33
    revision_to_commit,
28
34
    )
29
 
from bzrlib.plugins.git.shamap import GitShaMap
30
 
 
31
 
from dulwich.objects import (
32
 
    Blob,
 
35
from bzrlib.plugins.git.shamap import (
 
36
    SqliteGitShaMap,
33
37
    )
34
38
 
35
39
 
36
 
class GitObjectConverter(object):
 
40
class BazaarObjectStore(object):
 
41
    """A Git-style object store backed onto a Bazaar repository."""
37
42
 
38
43
    def __init__(self, repository, mapping=None):
39
44
        self.repository = repository
41
46
            self.mapping = self.repository.get_mapping()
42
47
        else:
43
48
            self.mapping = mapping
44
 
        self._idmap = GitShaMap(self.repository._transport)
 
49
        self._idmap = SqliteGitShaMap(self.repository._transport)
45
50
 
46
51
    def _update_sha_map(self):
47
52
        all_revids = self.repository.all_revision_ids()
55
60
                pb.update("updating git map", i, len(all_revids))
56
61
                self._update_sha_map_revision(revid)
57
62
        finally:
 
63
            self._idmap.commit()
58
64
            pb.finished()
59
65
 
60
66
    def _update_sha_map_revision(self, revid):
61
67
        inv = self.repository.get_inventory(revid)
62
 
        objects = inventory_to_tree_and_blobs(self.repository, self.mapping, revid)
 
68
        objects = inventory_to_tree_and_blobs(self.repository, self.mapping,
 
69
            revid)
63
70
        for sha, o, path in objects:
64
71
            if path == "":
65
72
                tree_sha = sha
66
73
            ie = inv[inv.path2id(path)]
67
74
            if ie.kind in ("file", "symlink"):
68
75
                self._idmap.add_entry(sha, "blob", (ie.file_id, ie.revision))
 
76
            elif ie.kind == "directory":
 
77
                self._idmap.add_entry(sha, "tree", (path, ie.revision))
69
78
            else:
70
 
                self._idmap.add_entry(sha, "tree", (ie.file_id, ie.revision))
 
79
                raise AssertionError()
71
80
        rev = self.repository.get_revision(revid)
72
 
        commit_obj = revision_to_commit(rev, tree_sha, self._idmap._parent_lookup)
73
 
        self._idmap.add_entry(commit_obj.sha().hexdigest(), "commit", (revid, tree_sha))
 
81
        commit_obj = revision_to_commit(rev, tree_sha,
 
82
            self._idmap._parent_lookup)
 
83
        try:
 
84
            foreign_revid, mapping = mapping_registry.parse_revision_id(revid)
 
85
        except errors.InvalidRevisionId:
 
86
            pass
 
87
        else:
 
88
            if foreign_revid != commit_obj.id:
 
89
                raise AssertionError("recreated git commit had different sha1: expected %s, got %s" % (foreign_revid, commit_obj.id))
 
90
        self._idmap.add_entry(commit_obj.id, "commit", (revid, tree_sha))
74
91
 
75
92
    def _get_blob(self, fileid, revision):
76
 
        text = self.repository.texts.get_record_stream([(fileid, revision)], "unordered", True).next().get_bytes_as("fulltext")
 
93
        """Return a Git Blob object from a fileid and revision stored in bzr.
 
94
        
 
95
        :param fileid: File id of the text
 
96
        :param revision: Revision of the text
 
97
        """
 
98
        text = self.repository.texts.get_record_stream([(fileid, revision)],
 
99
            "unordered", True).next().get_bytes_as("fulltext")
77
100
        blob = Blob()
78
101
        blob._text = text
79
102
        return blob
80
103
 
81
 
    def _get_tree(self, fileid, revid):
82
 
        raise NotImplementedError(self._get_tree)
 
104
    def _get_tree(self, path, revid, inv=None):
 
105
        """Return a Git Tree object from a path and a revision stored in bzr.
 
106
 
 
107
        :param path: path in the tree.
 
108
        :param revision: Revision of the tree.
 
109
        """
 
110
        if inv is None:
 
111
            inv = self.repository.get_inventory(revid)
 
112
        tree = Tree()
 
113
        fileid = inv.path2id(path)
 
114
        for name, ie in inv[fileid].children.iteritems():
 
115
            if ie.kind == "directory":
 
116
                subtree = self._get_tree(inv.id2path(ie.file_id), revid, inv)
 
117
                tree.add(stat.S_IFDIR, name.encode('UTF-8'), subtree.id)
 
118
            elif ie.kind == "file":
 
119
                blob = self._get_blob(ie.file_id, ie.revision)
 
120
                mode = stat.S_IFREG | 0644
 
121
                if ie.executable:
 
122
                    mode |= 0111
 
123
                tree.add(mode, name.encode('UTF-8'), blob.id)
 
124
            elif ie.kind == "symlink":
 
125
                raise AssertionError("Symlinks not yet supported")
 
126
        tree.serialize()
 
127
        return tree
83
128
 
84
129
    def _get_commit(self, revid, tree_sha):
85
130
        rev = self.repository.get_revision(revid)
86
131
        return revision_to_commit(rev, tree_sha, self._idmap._parent_lookup)
87
132
 
 
133
    def get_raw(self, sha):
 
134
        obj = self[sha]
 
135
        assert obj.id == sha
 
136
        return obj._text
 
137
 
88
138
    def __getitem__(self, sha):
89
139
        # See if sha is in map
90
140
        try: