/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: 2009-08-09 12:26:38 UTC
  • mto: (0.239.9 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090809122638-8oczy0uax7x204k2
Cope with nonexistent files and directories in get_file_sha1. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
17
17
 
18
18
"""An adapter between a Git Repository and a Bazaar Branch"""
19
19
 
 
20
import bzrlib
20
21
from bzrlib import (
21
22
    errors,
 
23
    graph,
22
24
    inventory,
 
25
    osutils,
23
26
    repository,
24
27
    revision,
25
28
    revisiontree,
31
34
from bzrlib.plugins.git.commit import (
32
35
    GitCommitBuilder,
33
36
    )
 
37
from bzrlib.plugins.git.inventory import (
 
38
    GitInventory,
 
39
    )
34
40
from bzrlib.plugins.git.mapping import (
35
41
    default_mapping,
36
42
    foreign_git,
37
43
    mapping_registry,
38
44
    )
39
 
from bzrlib.plugins.git.tree import (
40
 
    GitRevisionTree,
41
 
    )
42
45
from bzrlib.plugins.git.versionedfiles import (
43
46
    GitRevisions,
44
47
    GitTexts,
45
48
    )
46
49
 
47
50
 
48
 
from dulwich.objects import (
49
 
    Commit,
50
 
    )
51
 
 
52
 
 
53
51
class GitRepository(ForeignRepository):
54
52
    """An adapter to git repositories for bzr."""
55
53
 
58
56
    vcs = foreign_git
59
57
 
60
58
    def __init__(self, gitdir, lockfiles):
61
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir,
 
59
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
62
60
            lockfiles)
63
61
        from bzrlib.plugins.git import fetch, push
64
 
        for optimiser in [fetch.InterRemoteGitNonGitRepository,
 
62
        for optimiser in [fetch.InterRemoteGitNonGitRepository, 
65
63
                          fetch.InterLocalGitNonGitRepository,
66
64
                          fetch.InterGitGitRepository,
67
65
                          push.InterToLocalGitRepository,
69
67
            repository.InterRepository.register_optimiser(optimiser)
70
68
 
71
69
    def is_shared(self):
72
 
        return False
 
70
        return True
73
71
 
74
72
    def supports_rich_root(self):
75
73
        return True
76
74
 
77
 
    def _warn_if_deprecated(self, branch=None):
 
75
    def _warn_if_deprecated(self):
78
76
        # This class isn't deprecated
79
77
        pass
80
78
 
82
80
        return default_mapping
83
81
 
84
82
    def make_working_trees(self):
85
 
        return not self._git.bare
 
83
        return True
86
84
 
87
85
    def revision_graph_can_have_wrong_parents(self):
88
86
        return False
91
89
        interrepo = repository.InterRepository.get(source, self)
92
90
        return interrepo.dfetch(stop_revision)
93
91
 
 
92
    def dfetch_refs(self, source, stop_revision):
 
93
        interrepo = repository.InterRepository.get(source, self)
 
94
        return interrepo.dfetch_refs(stop_revision)
 
95
 
94
96
 
95
97
class LocalGitRepository(GitRepository):
96
98
    """Git repository on the file system."""
97
99
 
98
100
    def __init__(self, gitdir, lockfiles):
 
101
        # FIXME: This also caches negatives. Need to be more careful 
 
102
        # about this once we start writing to git
 
103
        self._parents_provider = graph.CachingParentsProvider(self)
99
104
        GitRepository.__init__(self, gitdir, lockfiles)
100
105
        self.base = gitdir.root_transport.base
101
106
        self._git = gitdir._git
 
107
        self.texts = None
102
108
        self.signatures = None
103
 
        self.revisions = GitRevisions(self, self._git.object_store)
 
109
        self.revisions = GitRevisions(self._git.object_store)
104
110
        self.inventories = None
105
111
        self.texts = GitTexts(self)
106
112
 
107
 
    def _iter_revision_ids(self):
108
 
        mapping = self.get_mapping()
109
 
        for sha in self._git.object_store:
110
 
            o = self._git.object_store[sha]
111
 
            if not isinstance(o, Commit):
112
 
                continue
113
 
            rev, roundtrip_revid, verifiers = mapping.import_commit(o,
114
 
                self.lookup_foreign_revision_id)
115
 
            yield o.id, rev.revision_id, roundtrip_revid
116
 
 
117
113
    def all_revision_ids(self):
118
 
        ret = set([])
119
 
        for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
120
 
            ret.add(revid)
121
 
            if roundtrip_revid:
122
 
                ret.add(roundtrip_revid)
 
114
        ret = set([revision.NULL_REVISION])
 
115
        heads = self._git.refs.as_dict('refs/heads')
 
116
        if heads == {}:
 
117
            return ret
 
118
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
119
        ret = set(bzr_heads)
 
120
        graph = self.get_graph()
 
121
        for rev, parents in graph.iter_ancestry(bzr_heads):
 
122
            ret.add(rev)
123
123
        return ret
124
124
 
 
125
    def _make_parents_provider(self):
 
126
        """See Repository._make_parents_provider()."""
 
127
        return self._parents_provider
 
128
 
125
129
    def get_parent_map(self, revids):
126
130
        parent_map = {}
127
131
        for revision_id in revids:
129
133
            if revision_id == revision.NULL_REVISION:
130
134
                parent_map[revision_id] = ()
131
135
                continue
132
 
            hexsha, mapping = self.lookup_bzr_revision_id(revision_id)
133
 
            try:
134
 
                commit = self._git[hexsha]
135
 
            except KeyError:
 
136
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
137
            commit  = self._git.commit(hexsha)
 
138
            if commit is None:
136
139
                continue
137
 
            parent_map[revision_id] = [
138
 
                self.lookup_foreign_revision_id(p, mapping)
139
 
                for p in commit.parents]
 
140
            else:
 
141
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
140
142
        return parent_map
141
143
 
142
144
    def get_ancestry(self, revision_id, topo_sorted=True):
155
157
    def get_signature_text(self, revision_id):
156
158
        raise errors.NoSuchRevision(self, revision_id)
157
159
 
158
 
    def pack(self, hint=None, clean_obsolete_packs=False):
159
 
        self._git.object_store.pack_loose_objects()
160
 
 
161
 
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
 
160
    def lookup_revision_id(self, revid):
162
161
        """Lookup a revision id.
163
 
 
 
162
        
 
163
        :param revid: Bazaar revision id.
 
164
        :return: Tuple with git revisionid and mapping.
164
165
        """
165
 
        assert type(foreign_revid) is str
166
 
        if mapping is None:
167
 
            mapping = self.get_mapping()
168
 
        from dulwich.protocol import (
169
 
            ZERO_SHA,
170
 
            )
171
 
        if foreign_revid == ZERO_SHA:
172
 
            return revision.NULL_REVISION
173
 
        commit = self._git[foreign_revid]
174
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(commit,
175
 
            lambda x: None)
176
 
        # FIXME: check testament before doing this?
177
 
        if roundtrip_revid:
178
 
            return roundtrip_revid
179
 
        else:
180
 
            return rev.revision_id
 
166
        # Yes, this doesn't really work, but good enough as a stub
 
167
        return osutils.sha(revid).hexdigest(), self.get_mapping()
181
168
 
182
169
    def has_signature_for_revision_id(self, revision_id):
183
170
        return False
184
171
 
185
 
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
 
172
    def lookup_git_revid(self, bzr_revid):
186
173
        try:
187
174
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
188
175
        except errors.InvalidRevisionId:
189
 
            if mapping is None:
190
 
                mapping = self.get_mapping()
191
 
            try:
192
 
                return (self._git.refs[mapping.revid_as_refname(bzr_revid)],
193
 
                        mapping)
194
 
            except KeyError:
195
 
                # Update refs from Git commit objects
196
 
                # FIXME: Hitting this a lot will be very inefficient...
197
 
                for git_sha, revid, roundtrip_revid in self._iter_revision_ids():
198
 
                    if not roundtrip_revid:
199
 
                        continue
200
 
                    refname = mapping.revid_as_refname(roundtrip_revid)
201
 
                    self._git.refs[refname] = git_sha
202
 
                    if roundtrip_revid == bzr_revid:
203
 
                        return git_sha, mapping
204
 
                raise errors.NoSuchRevision(self, bzr_revid)
 
176
            raise errors.NoSuchRevision(self, bzr_revid)
205
177
 
206
178
    def get_revision(self, revision_id):
207
 
        git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
 
179
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
208
180
        try:
209
 
            commit = self._git[git_commit_id]
 
181
            commit = self._git.commit(git_commit_id)
210
182
        except KeyError:
211
183
            raise errors.NoSuchRevision(self, revision_id)
212
 
        revision, roundtrip_revid, verifiers = mapping.import_commit(
213
 
            commit, self.lookup_foreign_revision_id)
 
184
        # print "fetched revision:", git_commit_id
 
185
        revision = mapping.import_commit(commit)
214
186
        assert revision is not None
215
 
        # FIXME: check verifiers ?
216
 
        if roundtrip_revid:
217
 
            revision.revision_id = roundtrip_revid
218
187
        return revision
219
188
 
220
189
    def has_revision(self, revision_id):
221
190
        try:
222
 
            git_commit_id, mapping = self.lookup_bzr_revision_id(revision_id)
 
191
            self.get_revision(revision_id)
223
192
        except errors.NoSuchRevision:
224
193
            return False
225
 
        return (git_commit_id in self._git)
226
 
 
227
 
    def has_revisions(self, revision_ids):
228
 
        return set(filter(self.has_revision, revision_ids))
 
194
        else:
 
195
            return True
229
196
 
230
197
    def get_revisions(self, revids):
231
198
        return [self.get_revision(r) for r in revids]
253
220
        progress=None):
254
221
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
255
222
 
256
 
    def _get_versioned_file_checker(self, text_key_references=None,
257
 
                        ancestors=None):
258
 
        return GitVersionedFileChecker(self,
259
 
            text_key_references=text_key_references, ancestors=ancestors)
260
 
 
261
 
 
262
 
class GitVersionedFileChecker(repository._VersionedFileChecker):
263
 
 
264
 
    file_ids = []
265
 
 
266
 
    def _check_file_version_parents(self, texts, progress_bar):
267
 
        return {}, []
 
223
 
 
224
class GitRevisionTree(revisiontree.RevisionTree):
 
225
 
 
226
    def __init__(self, repository, revision_id):
 
227
        self._revision_id = revision_id
 
228
        self._repository = repository
 
229
        store = repository._git.object_store
 
230
        assert isinstance(revision_id, str)
 
231
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
232
        try:
 
233
            commit = store[git_id]
 
234
        except KeyError, r:
 
235
            raise errors.NoSuchRevision(repository, revision_id)
 
236
        self.tree = commit.tree
 
237
        self._inventory = GitInventory(self.tree, self.mapping, store, 
 
238
                                       revision_id)
 
239
 
 
240
    def get_revision_id(self):
 
241
        return self._revision_id
 
242
 
 
243
    def get_file_text(self, file_id, path=None):
 
244
        if path is not None:
 
245
            entry = self._inventory._get_ie(path)
 
246
        else:
 
247
            entry = self._inventory[file_id]
 
248
        if entry.kind == 'directory': return ""
 
249
        return entry.object.data
268
250
 
269
251
 
270
252
class GitRepositoryFormat(repository.RepositoryFormat):
282
264
    def check_conversion_target(self, target_repo_format):
283
265
        return target_repo_format.rich_root_data
284
266
 
285
 
    def get_foreign_tests_repository_factory(self):
286
 
        from bzrlib.plugins.git.tests.test_repository import (
287
 
            ForeignTestsRepositoryFactory,
288
 
            )
289
 
        return ForeignTestsRepositoryFactory()
290
 
 
291
267
    def network_name(self):
292
268
        return "git"