/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

Don't modify dictionary during iteration.

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