/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: 2010-05-05 09:58:55 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100505095855-i0165hooflvk9chy
Ignore control files in inventories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
91
91
        interrepo = repository.InterRepository.get(source, self)
92
92
        return interrepo.dfetch(stop_revision)
93
93
 
 
94
    def dfetch_refs(self, source, stop_revision):
 
95
        interrepo = repository.InterRepository.get(source, self)
 
96
        return interrepo.dfetch_refs(stop_revision)
 
97
 
 
98
    def fetch_refs(self, source, stop_revision):
 
99
        interrepo = repository.InterRepository.get(source, self)
 
100
        return interrepo.fetch_refs(stop_revision)
 
101
 
94
102
 
95
103
class LocalGitRepository(GitRepository):
96
104
    """Git repository on the file system."""
104
112
        self.inventories = None
105
113
        self.texts = GitTexts(self)
106
114
 
107
 
    def _iter_revision_ids(self):
 
115
    def all_revision_ids(self):
 
116
        ret = set([])
108
117
        for sha in self._git.object_store:
109
118
            o = self._git.object_store[sha]
110
119
            if not isinstance(o, Commit):
111
120
                continue
112
 
            rev = self.get_mapping().import_commit(o,
113
 
                self.lookup_foreign_revision_id)
114
 
            yield o.id, rev.revision_id
115
 
 
116
 
    def all_revision_ids(self):
117
 
        ret = set([])
118
 
        for git_sha, revid in self._iter_revision_ids():
119
 
            ret.add(revid)
 
121
            rev = self.get_mapping().import_commit(o)
 
122
            ret.append(rev.revision_id)
120
123
        return ret
121
124
 
122
125
    def get_parent_map(self, revids):
131
134
                commit = self._git[hexsha]
132
135
            except KeyError:
133
136
                continue
134
 
            parent_map[revision_id] = [self.lookup_foreign_revision_id(p, mapping) for p in commit.parents]
 
137
            parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
135
138
        return parent_map
136
139
 
137
140
    def get_ancestry(self, revision_id, topo_sorted=True):
150
153
    def get_signature_text(self, revision_id):
151
154
        raise errors.NoSuchRevision(self, revision_id)
152
155
 
153
 
    def pack(self, hint=None, clean_obsolete_packs=False):
154
 
        self._git.object_store.pack_loose_objects()
155
 
 
156
156
    def lookup_foreign_revision_id(self, foreign_revid, mapping=None):
157
157
        """Lookup a revision id.
158
158
 
159
159
        """
160
160
        if mapping is None:
161
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
 
162
        return mapping.revision_id_foreign_to_bzr(foreign_revid)
170
163
 
171
164
    def has_signature_for_revision_id(self, revision_id):
172
165
        return False
173
166
 
174
 
    def lookup_bzr_revision_id(self, bzr_revid, mapping=None):
 
167
    def lookup_bzr_revision_id(self, bzr_revid):
175
168
        try:
176
169
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
177
170
        except errors.InvalidRevisionId:
178
 
            if mapping is None:
179
 
                mapping = self.get_mapping()
 
171
            mapping = self.get_mapping()
180
172
            try:
181
173
                return self._git.refs[mapping.revid_as_refname(bzr_revid)], mapping
182
174
            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
175
                raise errors.NoSuchRevision(self, bzr_revid)
190
176
 
191
177
    def get_revision(self, revision_id):
195
181
        except KeyError:
196
182
            raise errors.NoSuchRevision(self, revision_id)
197
183
        # print "fetched revision:", git_commit_id
198
 
        revision = mapping.import_commit(commit,
199
 
            self.lookup_foreign_revision_id)
 
184
        revision = mapping.import_commit(commit)
200
185
        assert revision is not None
201
186
        return revision
202
187
 
208
193
        return (git_commit_id in self._git)
209
194
 
210
195
    def has_revisions(self, revision_ids):
211
 
        return set(filter(self.has_revision, revision_ids))
 
196
        ret = set()
 
197
        for revid in revision_ids:
 
198
            if self.has_revision(revid):
 
199
                ret.add(revid)
 
200
        return ret
212
201
 
213
202
    def get_revisions(self, revids):
214
203
        return [self.get_revision(r) for r in revids]