/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: John Carr
  • Date: 2009-01-13 20:26:54 UTC
  • mto: (0.217.53 git-serve)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: john.carr@unrouted.co.uk-20090113202654-9hsels0a9r35o7u0
Rename upload-pack and receive-pack so they don't clash with the Git versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
41
41
from bzrlib.plugins.git.foreign import (
42
42
    versionedfiles,
43
43
    )
44
 
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry
45
 
from bzrlib.plugins.git.versionedfiles import GitTexts
 
44
from bzrlib.plugins.git.mapping import default_mapping
46
45
 
47
 
import dulwich as git
 
46
from bzrlib.plugins.git import git
48
47
 
49
48
 
50
49
class GitTags(object):
96
95
        self.texts = None
97
96
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
98
97
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
99
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
100
 
        self.texts = GitTexts(self)
101
98
        self.tags = GitTags(self._git.get_tags())
102
99
 
103
100
    def all_revision_ids(self):
128
125
            if revision_id == revision.NULL_REVISION:
129
126
                parent_map[revision_id] = ()
130
127
                continue
131
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
128
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
132
129
            commit  = self._git.commit(hexsha)
133
130
            if commit is None:
134
131
                continue
135
132
            else:
136
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
133
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
137
134
        return parent_map
138
135
 
139
136
    def get_ancestry(self, revision_id, topo_sorted=True):
166
163
    def has_signature_for_revision_id(self, revision_id):
167
164
        return False
168
165
 
169
 
    def lookup_git_revid(self, bzr_revid):
 
166
    def lookup_git_revid(self, bzr_revid, mapping):
170
167
        try:
171
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
168
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
172
169
        except errors.InvalidRevisionId:
173
170
            raise errors.NoSuchRevision(self, bzr_revid)
174
171
 
175
172
    def get_revision(self, revision_id):
176
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
 
173
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
177
174
        try:
178
175
            commit = self._git.commit(git_commit_id)
179
176
        except KeyError:
180
177
            raise errors.NoSuchRevision(self, revision_id)
181
178
        # print "fetched revision:", git_commit_id
182
 
        revision = mapping.import_commit(commit)
 
179
        revision = self.get_mapping().import_commit(commit)
183
180
        assert revision is not None
184
181
        return revision
185
182
 
206
203
            inv.revision_id = revision_id
207
204
            return revisiontree.RevisionTree(self, inv, revision_id)
208
205
 
209
 
        return GitRevisionTree(self, revision_id)
 
206
        return GitRevisionTree(self, self.get_mapping(), revision_id)
210
207
 
211
208
    def get_inventory(self, revision_id):
212
209
        assert revision_id != None
221
218
 
222
219
class GitRevisionTree(revisiontree.RevisionTree):
223
220
 
224
 
    def __init__(self, repository, revision_id):
 
221
    def __init__(self, repository, mapping, revision_id):
225
222
        self._repository = repository
226
223
        self.revision_id = revision_id
227
224
        assert isinstance(revision_id, str)
228
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
 
225
        self.mapping = mapping
 
226
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
229
227
        try:
230
228
            commit = repository._git.commit(git_id)
231
229
        except KeyError, r: