/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 repository.py

  • Committer: Jelmer Vernooij
  • Date: 2008-12-25 01:28:00 UTC
  • mto: (0.200.144 dulwich)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20081225012800-96iswmhsbn3wlyz6
Update copyright years.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
1
1
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
17
16
 
18
17
"""An adapter between a Git Repository and a Bazaar Branch"""
19
18
 
 
19
import os
 
20
import time
 
21
 
20
22
import bzrlib
21
23
from bzrlib import (
 
24
    deprecated_graph,
22
25
    errors,
23
26
    graph,
24
27
    inventory,
26
29
    repository,
27
30
    revision,
28
31
    revisiontree,
29
 
    ui,
30
32
    urlutils,
 
33
    versionedfile,
31
34
    )
32
35
from bzrlib.foreign import (
 
36
        ForeignRevision,
 
37
        )
 
38
from bzrlib.trace import mutter
 
39
from bzrlib.transport import get_transport
 
40
 
 
41
from bzrlib.plugins.git.foreign import (
33
42
    ForeignRepository,
34
 
    )
35
 
from bzrlib.trace import (
36
 
    mutter,
37
 
    )
38
 
from bzrlib.transport import (
39
 
    get_transport,
40
 
    )
41
 
 
42
 
from bzrlib.plugins.git.commit import (
43
 
    GitCommitBuilder,
44
 
    )
45
 
from bzrlib.plugins.git.inventory import (
46
 
    GitInventory,
47
 
    )
48
 
from bzrlib.plugins.git.mapping import (
49
 
    default_mapping,
50
 
    foreign_git,
51
 
    mapping_registry,
52
 
    )
53
 
from bzrlib.plugins.git.versionedfiles import (
54
 
    GitRevisions,
55
 
    GitTexts,
56
 
    )
 
43
    versionedfiles,
 
44
    )
 
45
from bzrlib.plugins.git.mapping import default_mapping
 
46
 
 
47
from bzrlib.plugins.git import git
 
48
 
 
49
 
 
50
class GitTags(object):
 
51
 
 
52
    def __init__(self, tags):
 
53
        self._tags = tags
 
54
 
 
55
    def __iter__(self):
 
56
        return iter(self._tags)
57
57
 
58
58
 
59
59
class GitRepository(ForeignRepository):
60
60
    """An adapter to git repositories for bzr."""
61
61
 
62
62
    _serializer = None
63
 
    _commit_builder_class = GitCommitBuilder
64
 
    vcs = foreign_git
65
 
 
66
 
    def __init__(self, gitdir, lockfiles):
67
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
68
 
            lockfiles)
69
 
        from bzrlib.plugins.git import fetch, push
70
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
71
 
                          fetch.InterLocalGitNonGitRepository,
72
 
                          fetch.InterGitGitRepository,
73
 
                          push.InterToLocalGitRepository,
74
 
                          push.InterToRemoteGitRepository]:
75
 
            repository.InterRepository.register_optimiser(optimiser)
76
 
 
77
 
    def is_shared(self):
78
 
        return True
79
 
 
80
 
    def supports_rich_root(self):
81
 
        return True
82
 
 
83
 
    def _warn_if_deprecated(self):
84
 
        # This class isn't deprecated
85
 
        pass
86
 
 
87
 
    def get_mapping(self):
88
 
        return default_mapping
89
 
 
90
 
    def make_working_trees(self):
91
 
        return True
92
 
 
93
 
    def revision_graph_can_have_wrong_parents(self):
94
 
        return False
95
 
 
96
 
    def dfetch(self, source, stop_revision):
97
 
        interrepo = repository.InterRepository.get(source, self)
98
 
        return interrepo.dfetch(stop_revision)
99
 
 
100
 
    def dfetch_refs(self, source, stop_revision):
101
 
        interrepo = repository.InterRepository.get(source, self)
102
 
        return interrepo.dfetch_refs(stop_revision)
103
 
 
104
 
 
105
 
class LocalGitRepository(GitRepository):
106
 
    """Git repository on the file system."""
107
63
 
108
64
    def __init__(self, gitdir, lockfiles):
109
65
        # FIXME: This also caches negatives. Need to be more careful 
110
66
        # about this once we start writing to git
111
67
        self._parents_provider = graph.CachingParentsProvider(self)
112
 
        GitRepository.__init__(self, gitdir, lockfiles)
 
68
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
113
69
        self.base = gitdir.root_transport.base
 
70
        self.bzrdir = gitdir
114
71
        self._git = gitdir._git
115
72
        self.texts = None
116
 
        self.signatures = None
117
 
        self.revisions = GitRevisions(self._git.object_store)
118
 
        self.inventories = None
119
 
        self.texts = GitTexts(self)
 
73
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
 
74
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
 
75
        self.tags = GitTags(self._git.get_tags())
 
76
        from bzrlib.plugins.git import fetch
 
77
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
120
78
 
121
79
    def all_revision_ids(self):
122
80
        ret = set([revision.NULL_REVISION])
123
 
        heads = self._git.refs.as_dict('refs/heads')
124
 
        if heads == {}:
 
81
        if self._git.heads() == []:
125
82
            return ret
126
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
83
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
127
84
        ret = set(bzr_heads)
128
85
        graph = self.get_graph()
129
86
        for rev, parents in graph.iter_ancestry(bzr_heads):
130
87
            ret.add(rev)
131
88
        return ret
132
89
 
 
90
    def is_shared(self):
 
91
        return True
 
92
 
 
93
    def supports_rich_root(self):
 
94
        return True
 
95
 
 
96
    #def get_revision_delta(self, revision_id):
 
97
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
 
98
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
 
99
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
 
100
 
133
101
    def _make_parents_provider(self):
134
102
        """See Repository._make_parents_provider()."""
135
103
        return self._parents_provider
136
104
 
137
105
    def get_parent_map(self, revids):
138
106
        parent_map = {}
 
107
        mutter("get_parent_map(%r)", revids)
139
108
        for revision_id in revids:
140
109
            assert isinstance(revision_id, str)
141
110
            if revision_id == revision.NULL_REVISION:
142
111
                parent_map[revision_id] = ()
143
112
                continue
144
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
113
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
145
114
            commit  = self._git.commit(hexsha)
146
115
            if commit is None:
147
116
                continue
148
117
            else:
149
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
118
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
150
119
        return parent_map
151
120
 
152
121
    def get_ancestry(self, revision_id, topo_sorted=True):
153
122
        """See Repository.get_ancestry().
154
123
        """
155
124
        if revision_id is None:
156
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
125
            return self._all_revision_ids()
157
126
        assert isinstance(revision_id, str)
158
127
        ancestry = []
159
128
        graph = self.get_graph()
160
129
        for rev, parents in graph.iter_ancestry([revision_id]):
 
130
            if rev == revision.NULL_REVISION:
 
131
                rev = None
161
132
            ancestry.append(rev)
162
133
        ancestry.reverse()
163
 
        return [None] + ancestry
 
134
        return ancestry
 
135
 
 
136
    def _warn_if_deprecated(self):
 
137
        # This class isn't deprecated
 
138
        pass
164
139
 
165
140
    def get_signature_text(self, revision_id):
166
141
        raise errors.NoSuchRevision(self, revision_id)
177
152
    def has_signature_for_revision_id(self, revision_id):
178
153
        return False
179
154
 
180
 
    def lookup_git_revid(self, bzr_revid):
 
155
    def get_mapping(self):
 
156
        return default_mapping
 
157
 
 
158
    def lookup_git_revid(self, bzr_revid, mapping):
181
159
        try:
182
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
160
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
183
161
        except errors.InvalidRevisionId:
184
162
            raise errors.NoSuchRevision(self, bzr_revid)
185
163
 
186
164
    def get_revision(self, revision_id):
187
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
188
 
        try:
189
 
            commit = self._git.commit(git_commit_id)
190
 
        except KeyError:
 
165
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
166
        commit = self._git.commit(git_commit_id)
 
167
        # print "fetched revision:", git_commit_id
 
168
        if commit is None:
191
169
            raise errors.NoSuchRevision(self, revision_id)
192
 
        # print "fetched revision:", git_commit_id
193
 
        revision = mapping.import_commit(commit)
 
170
        revision = self._parse_rev(commit, self.get_mapping())
194
171
        assert revision is not None
195
172
        return revision
196
173
 
205
182
    def get_revisions(self, revids):
206
183
        return [self.get_revision(r) for r in revids]
207
184
 
 
185
    @classmethod
 
186
    def _parse_rev(klass, commit, mapping):
 
187
        """Convert a git commit to a bzr revision.
 
188
 
 
189
        :return: a `bzrlib.revision.Revision` object.
 
190
        """
 
191
        if commit is None:
 
192
            raise AssertionError("Commit object can't be None")
 
193
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
194
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
 
195
        rev.message = commit.message.decode("utf-8", "replace")
 
196
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
197
        if commit.committer != commit.author:
 
198
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
199
        rev.timestamp = commit.commit_time
 
200
        rev.timezone = 0
 
201
        return rev
 
202
 
208
203
    def revision_trees(self, revids):
209
204
        for revid in revids:
210
205
            yield self.revision_tree(revid)
211
206
 
212
207
    def revision_tree(self, revision_id):
213
208
        revision_id = revision.ensure_null(revision_id)
 
209
 
214
210
        if revision_id == revision.NULL_REVISION:
215
211
            inv = inventory.Inventory(root_id=None)
216
212
            inv.revision_id = revision_id
217
213
            return revisiontree.RevisionTree(self, inv, revision_id)
 
214
 
218
215
        return GitRevisionTree(self, revision_id)
219
216
 
220
217
    def get_inventory(self, revision_id):
224
221
    def set_make_working_trees(self, trees):
225
222
        pass
226
223
 
227
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
228
 
        progress=None):
229
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
224
 
 
225
def escape_file_id(file_id):
 
226
    return file_id.replace('_', '__').replace(' ', '_s')
 
227
 
 
228
 
 
229
def unescape_file_id(file_id):
 
230
    return file_id.replace("_s", " ").replace("__", "_")
230
231
 
231
232
 
232
233
class GitRevisionTree(revisiontree.RevisionTree):
233
234
 
234
235
    def __init__(self, repository, revision_id):
235
 
        self._revision_id = revision_id
236
236
        self._repository = repository
237
 
        store = repository._git.object_store
238
 
        assert isinstance(revision_id, str)
239
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
240
 
        try:
241
 
            commit = store[git_id]
242
 
        except KeyError, r:
243
 
            raise errors.NoSuchRevision(repository, revision_id)
244
 
        self.tree = commit.tree
245
 
        self._inventory = GitInventory(self.tree, self.mapping, store, 
246
 
                                       revision_id)
 
237
        self.revision_id = revision_id
 
238
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
239
        self.tree = repository._git.commit(git_id).tree
 
240
        self._inventory = inventory.Inventory(revision_id=revision_id)
 
241
        self._inventory.root.revision = revision_id
 
242
        self._build_inventory(self.tree, self._inventory.root, "")
247
243
 
248
244
    def get_revision_id(self):
249
 
        return self._revision_id
 
245
        return self.revision_id
250
246
 
251
 
    def get_file_text(self, file_id, path=None):
252
 
        if path is not None:
253
 
            entry = self._inventory._get_ie(path)
254
 
        else:
255
 
            entry = self._inventory[file_id]
 
247
    def get_file_text(self, file_id):
 
248
        entry = self._inventory[file_id]
256
249
        if entry.kind == 'directory': return ""
257
 
        return entry.object.data
258
 
 
259
 
 
260
 
class GitRepositoryFormat(repository.RepositoryFormat):
261
 
    """Git repository format."""
 
250
        return self._repository._git.get_blob(entry.text_id).data
 
251
 
 
252
    def _build_inventory(self, tree_id, ie, path):
 
253
        assert isinstance(path, str)
 
254
        tree = self._repository._git.get_tree(tree_id)
 
255
        for mode, name, hexsha in tree.entries():
 
256
            basename = name.decode("utf-8")
 
257
            if path == "":
 
258
                child_path = name
 
259
            else:
 
260
                child_path = urlutils.join(path, name)
 
261
            file_id = escape_file_id(child_path.encode('utf-8'))
 
262
            entry_kind = (mode & 0700000) / 0100000
 
263
            if entry_kind == 0:
 
264
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
 
265
            elif entry_kind == 1:
 
266
                file_kind = (mode & 070000) / 010000
 
267
                b = self._repository._git.get_blob(hexsha)
 
268
                if file_kind == 0:
 
269
                    child_ie = inventory.InventoryFile(file_id, basename, ie.file_id)
 
270
                    child_ie.text_sha1 = osutils.sha_string(b.data)
 
271
                elif file_kind == 2:
 
272
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
 
273
                    child_ie.text_sha1 = osutils.sha_string("")
 
274
                else:
 
275
                    raise AssertionError(
 
276
                        "Unknown file kind, perms=%o." % (mode,))
 
277
                child_ie.text_id = b.id
 
278
                child_ie.text_size = len(b.data)
 
279
            else:
 
280
                raise AssertionError(
 
281
                    "Unknown blob kind, perms=%r." % (mode,))
 
282
            fs_mode = mode & 0777
 
283
            child_ie.executable = bool(fs_mode & 0111)
 
284
            child_ie.revision = self.revision_id
 
285
            self._inventory.add(child_ie)
 
286
            if entry_kind == 0:
 
287
                self._build_inventory(hexsha, child_ie, child_path)
 
288
 
 
289
 
 
290
class GitFormat(object):
262
291
 
263
292
    supports_tree_reference = False
264
293
    rich_root_data = True
271
300
 
272
301
    def check_conversion_target(self, target_repo_format):
273
302
        return target_repo_format.rich_root_data
274
 
 
275
 
    def network_name(self):
276
 
        return "git"