/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 gitlib/git_repository.py

Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gitlib/git_repository.py
16
16
 
17
17
"""An adapter between a Git Repository and a Bazaar Branch"""
18
18
 
19
 
import os
20
 
import time
21
 
 
22
 
import bzrlib
23
19
from bzrlib import (
24
 
    deprecated_graph,
25
20
    errors,
26
 
    graph,
27
 
    inventory,
28
 
    osutils,
29
21
    repository,
30
 
    revision,
31
 
    revisiontree,
32
22
    urlutils,
33
 
    versionedfile,
34
 
    )
35
 
from bzrlib.foreign import (
36
 
        ForeignRepository,
37
 
        )
38
 
from bzrlib.trace import mutter
39
 
from bzrlib.transport import get_transport
40
 
 
41
 
from bzrlib.plugins.git.foreign import (
42
 
    versionedfiles,
43
 
    )
44
 
from bzrlib.plugins.git.mapping import default_mapping
45
 
 
46
 
from bzrlib.plugins.git import git
47
 
 
48
 
 
49
 
class GitTags(object):
50
 
 
51
 
    def __init__(self, tags):
52
 
        self._tags = tags
53
 
 
54
 
    def __iter__(self):
55
 
        return iter(self._tags)
56
 
 
57
 
 
58
 
class GitRepository(ForeignRepository):
 
23
    )
 
24
 
 
25
from bzrlib.plugins.git import GitModel
 
26
 
 
27
 
 
28
class GitRepository(repository.Repository):
59
29
    """An adapter to git repositories for bzr."""
60
30
 
61
 
    _serializer = None
62
 
 
63
31
    def __init__(self, gitdir, lockfiles):
64
 
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
65
 
        from bzrlib.plugins.git import fetch
66
 
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
67
 
        repository.InterRepository.register_optimiser(fetch.InterGitNonGitRepository)
 
32
        self.bzrdir = gitdir
 
33
        self.control_files = lockfiles
 
34
        gitdirectory = urlutils.local_path_from_url(gitdir.transport.base)
 
35
        self.git = GitModel(gitdirectory)
 
36
        self._revision_cache = {}
 
37
 
 
38
    def _ancestor_revisions(self, revision_ids):
 
39
        if revision_ids is not None:
 
40
            git_revisions = [gitrevid_from_bzr(r) for r in revision_ids]
 
41
        else:
 
42
            git_revisions = None
 
43
        for lines in self.git.ancestor_lines(git_revisions):
 
44
            yield self.parse_rev(lines)
68
45
 
69
46
    def is_shared(self):
70
47
        return True
71
48
 
72
 
    def supports_rich_root(self):
73
 
        return True
74
 
 
75
 
    def _warn_if_deprecated(self):
76
 
        # This class isn't deprecated
77
 
        pass
78
 
 
79
 
    def get_mapping(self):
80
 
        return default_mapping
81
 
 
82
 
    def make_working_trees(self):
83
 
        return True
84
 
 
85
 
 
86
 
class LocalGitRepository(GitRepository):
87
 
 
88
 
    def __init__(self, gitdir, lockfiles):
89
 
        # FIXME: This also caches negatives. Need to be more careful 
90
 
        # about this once we start writing to git
91
 
        self._parents_provider = graph.CachingParentsProvider(self)
92
 
        GitRepository.__init__(self, gitdir, lockfiles)
93
 
        self.base = gitdir.root_transport.base
94
 
        self._git = gitdir._git
95
 
        self.texts = None
96
 
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
 
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.tags = GitTags(self._git.get_tags())
99
 
 
100
 
    def all_revision_ids(self):
101
 
        ret = set([revision.NULL_REVISION])
102
 
        if self._git.heads() == []:
103
 
            return ret
104
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
105
 
        ret = set(bzr_heads)
106
 
        graph = self.get_graph()
107
 
        for rev, parents in graph.iter_ancestry(bzr_heads):
108
 
            ret.add(rev)
109
 
        return ret
110
 
 
111
 
    #def get_revision_delta(self, revision_id):
112
 
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
113
 
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
114
 
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
115
 
 
116
 
    def _make_parents_provider(self):
117
 
        """See Repository._make_parents_provider()."""
118
 
        return self._parents_provider
119
 
 
120
 
    def get_parent_map(self, revids):
121
 
        parent_map = {}
122
 
        mutter("get_parent_map(%r)", revids)
123
 
        for revision_id in revids:
124
 
            assert isinstance(revision_id, str)
125
 
            if revision_id == revision.NULL_REVISION:
126
 
                parent_map[revision_id] = ()
127
 
                continue
128
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
129
 
            commit  = self._git.commit(hexsha)
130
 
            if commit is None:
131
 
                continue
132
 
            else:
133
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
134
 
        return parent_map
135
 
 
136
 
    def get_ancestry(self, revision_id, topo_sorted=True):
137
 
        """See Repository.get_ancestry().
138
 
        """
 
49
    def get_revision_graph(self, revision_id=None):
139
50
        if revision_id is None:
140
 
            return self._all_revision_ids()
141
 
        assert isinstance(revision_id, str)
142
 
        ancestry = []
143
 
        graph = self.get_graph()
144
 
        for rev, parents in graph.iter_ancestry([revision_id]):
145
 
            if rev == revision.NULL_REVISION:
146
 
                rev = None
147
 
            ancestry.append(rev)
148
 
        ancestry.reverse()
149
 
        return ancestry
150
 
 
151
 
    def get_signature_text(self, revision_id):
152
 
        raise errors.NoSuchRevision(self, revision_id)
153
 
 
154
 
    def lookup_revision_id(self, revid):
155
 
        """Lookup a revision id.
156
 
        
157
 
        :param revid: Bazaar revision id.
158
 
        :return: Tuple with git revisionid and mapping.
159
 
        """
160
 
        # Yes, this doesn't really work, but good enough as a stub
161
 
        return osutils.sha(rev_id).hexdigest(), self.get_mapping()
162
 
 
163
 
    def has_signature_for_revision_id(self, revision_id):
164
 
        return False
165
 
 
166
 
    def lookup_git_revid(self, bzr_revid, mapping):
167
 
        try:
168
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
169
 
        except errors.InvalidRevisionId:
170
 
            raise errors.NoSuchRevision(self, bzr_revid)
 
51
            revisions = None
 
52
        else:
 
53
            revisions = [revision_id]
 
54
        return self.get_revision_graph_with_ghosts(revisions).get_ancestors()
 
55
 
 
56
    def get_revision_graph_with_ghosts(self, revision_ids=None):
 
57
        result = deprecated_graph.Graph()
 
58
        for revision in self._ancestor_revisions(revision_ids):
 
59
            result.add_node(revision.revision_id, revision.parent_ids)
 
60
            self._revision_cache[revision.revision_id] = revision
 
61
        return result
171
62
 
172
63
    def get_revision(self, revision_id):
173
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
174
 
        try:
175
 
            commit = self._git.commit(git_commit_id)
176
 
        except KeyError:
177
 
            raise errors.NoSuchRevision(self, revision_id)
178
 
        # print "fetched revision:", git_commit_id
179
 
        revision = self.get_mapping().import_commit(commit)
180
 
        assert revision is not None
181
 
        return revision
 
64
        if revision_id in self._revision_cache:
 
65
            return self._revision_cache[revision_id]
 
66
        raw = self.git.rev_list([gitrevid_from_bzr(revision_id)], max_count=1,
 
67
                                header=True)
 
68
        return self.parse_rev(raw)
182
69
 
183
70
    def has_revision(self, revision_id):
184
71
        try:
185
72
            self.get_revision(revision_id)
186
 
        except errors.NoSuchRevision:
 
73
        except NoSuchRevision:
187
74
            return False
188
75
        else:
189
76
            return True
190
77
 
191
 
    def get_revisions(self, revids):
192
 
        return [self.get_revision(r) for r in revids]
 
78
    def get_revisions(self, revisions):
 
79
        return [self.get_revision(r) for r in revisions]
 
80
 
 
81
    def parse_rev(self, raw):
 
82
        # first field is the rev itself.
 
83
        # then its 'field value'
 
84
        # until the EOF??
 
85
        parents = []
 
86
        log = []
 
87
        in_log = False
 
88
        committer = None
 
89
        revision_id = bzrrevid_from_git(raw[0][:-1])
 
90
        for field in raw[1:]:
 
91
            #if field.startswith('author '):
 
92
            #    committer = field[7:]
 
93
            if field.startswith('parent '):
 
94
                parents.append(bzrrevid_from_git(field.split()[1]))
 
95
            elif field.startswith('committer '):
 
96
                commit_fields = field.split()
 
97
                if committer is None:
 
98
                    committer = ' '.join(commit_fields[1:-3])
 
99
                timestamp = commit_fields[-2]
 
100
                timezone = commit_fields[-1]
 
101
            elif field.startswith('tree '):
 
102
                tree_id = field.split()[1]
 
103
            elif in_log:
 
104
                log.append(field[4:])
 
105
            elif field == '\n':
 
106
                in_log = True
 
107
 
 
108
        log = ''.join(log)
 
109
        result = Revision(revision_id)
 
110
        result.parent_ids = parents
 
111
        result.message = log
 
112
        result.inventory_sha1 = ""
 
113
        result.timezone = timezone and int(timezone)
 
114
        result.timestamp = float(timestamp)
 
115
        result.committer = committer 
 
116
        result.properties['git-tree-id'] = tree_id
 
117
        return result
193
118
 
194
119
    def revision_trees(self, revids):
195
120
        for revid in revids:
196
121
            yield self.revision_tree(revid)
197
122
 
198
123
    def revision_tree(self, revision_id):
199
 
        revision_id = revision.ensure_null(revision_id)
200
 
 
201
 
        if revision_id == revision.NULL_REVISION:
202
 
            inv = inventory.Inventory(root_id=None)
203
 
            inv.revision_id = revision_id
204
 
            return revisiontree.RevisionTree(self, inv, revision_id)
205
 
 
206
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
124
        return GitRevisionTree(self, revision_id)
207
125
 
208
126
    def get_inventory(self, revision_id):
209
 
        assert revision_id != None
210
 
        return self.revision_tree(revision_id).inventory
211
 
 
212
 
    def set_make_working_trees(self, trees):
213
 
        pass
214
 
 
215
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
216
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
217
 
 
218
 
 
219
 
class GitRevisionTree(revisiontree.RevisionTree):
220
 
 
221
 
    def __init__(self, repository, mapping, revision_id):
222
 
        self._repository = repository
 
127
        revision = self.get_revision(revision_id)
 
128
        inventory = GitInventory(revision_id)
 
129
        tree_id = revision.properties['git-tree-id']
 
130
        type_map = {'blob': 'file', 'tree': 'directory' }
 
131
        def get_inventory(tree_id, prefix):
 
132
            for perms, type, obj_id, name in self.git.get_inventory(tree_id):
 
133
                full_path = prefix + name
 
134
                if type == 'blob':
 
135
                    text_sha1 = obj_id
 
136
                else:
 
137
                    text_sha1 = None
 
138
                executable = (perms[-3] in ('1', '3', '5', '7'))
 
139
                entry = GitEntry(full_path, type_map[type], revision_id,
 
140
                                 text_sha1, executable)
 
141
                inventory.entries[full_path] = entry
 
142
                if type == 'tree':
 
143
                    get_inventory(obj_id, full_path+'/')
 
144
        get_inventory(tree_id, '')
 
145
        return inventory
 
146
 
 
147
 
 
148
class GitRevisionTree(object):
 
149
 
 
150
    def __init__(self, repository, revision_id):
 
151
        self.repository = repository
223
152
        self.revision_id = revision_id
224
 
        assert isinstance(revision_id, str)
225
 
        self.mapping = mapping
226
 
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
227
 
        try:
228
 
            commit = repository._git.commit(git_id)
229
 
        except KeyError, r:
230
 
            raise errors.NoSuchRevision(repository, revision_id)
231
 
        self.tree = commit.tree
232
 
        self._inventory = inventory.Inventory(revision_id=revision_id)
233
 
        self._inventory.root.revision = revision_id
234
 
        self._build_inventory(self.tree, self._inventory.root, "")
235
 
 
236
 
    def get_revision_id(self):
237
 
        return self.revision_id
238
 
 
239
 
    def get_file_text(self, file_id):
240
 
        entry = self._inventory[file_id]
241
 
        if entry.kind == 'directory': return ""
242
 
        return self._repository._git.get_blob(entry.text_id).data
243
 
 
244
 
    def _build_inventory(self, tree_id, ie, path):
245
 
        assert isinstance(path, str)
246
 
        tree = self._repository._git.tree(tree_id)
247
 
        for mode, name, hexsha in tree.entries():
248
 
            basename = name.decode("utf-8")
249
 
            if path == "":
250
 
                child_path = name
251
 
            else:
252
 
                child_path = urlutils.join(path, name)
253
 
            file_id = self.mapping.generate_file_id(child_path)
254
 
            entry_kind = (mode & 0700000) / 0100000
255
 
            if entry_kind == 0:
256
 
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
257
 
            elif entry_kind == 1:
258
 
                file_kind = (mode & 070000) / 010000
259
 
                b = self._repository._git.get_blob(hexsha)
260
 
                if file_kind == 0:
261
 
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
262
 
                    child_ie.text_sha1 = osutils.sha_string(b.data)
263
 
                elif file_kind == 2:
264
 
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
265
 
                    child_ie.text_sha1 = osutils.sha_string("")
266
 
                else:
267
 
                    raise AssertionError(
268
 
                        "Unknown file kind, perms=%o." % (mode,))
269
 
                child_ie.text_id = b.id
270
 
                child_ie.text_size = len(b.data)
271
 
            else:
272
 
                raise AssertionError(
273
 
                    "Unknown blob kind, perms=%r." % (mode,))
274
 
            fs_mode = mode & 0777
275
 
            child_ie.executable = bool(fs_mode & 0111)
276
 
            child_ie.revision = self.revision_id
277
 
            self._inventory.add(child_ie)
278
 
            if entry_kind == 0:
279
 
                self._build_inventory(hexsha, child_ie, child_path)
280
 
 
281
 
 
282
 
class GitFormat(object):
283
 
 
284
 
    supports_tree_reference = False
285
 
    rich_root_data = True
286
 
 
287
 
    def get_format_description(self):
288
 
        return "Git Repository"
289
 
 
290
 
    def initialize(self, url, shared=False, _internal=False):
291
 
        raise bzr_errors.UninitializableFormat(self)
292
 
 
293
 
    def check_conversion_target(self, target_repo_format):
294
 
        return target_repo_format.rich_root_data
 
153
        self.inventory = repository.get_inventory(revision_id)
 
154
 
 
155
    def get_file(self, file_id):
 
156
        obj_id = self.inventory[file_id].text_sha1
 
157
        lines = self.repository.git.cat_file('blob', obj_id)
 
158
        return iterablefile.IterableFile(lines)
 
159
 
 
160
    def is_executable(self, file_id):
 
161
        return self.inventory[file_id].executable
 
162
 
 
163