/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

Fix branch cloning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
34
34
    )
35
35
from bzrlib.foreign import (
36
36
        ForeignRepository,
37
 
        ForeignRevision,
38
37
        )
39
38
from bzrlib.trace import mutter
40
39
from bzrlib.transport import get_transport
64
63
    def __init__(self, gitdir, lockfiles):
65
64
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
66
65
        from bzrlib.plugins.git import fetch
67
 
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
 
66
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
68
67
 
69
68
    def is_shared(self):
70
69
        return True
79
78
    def get_mapping(self):
80
79
        return default_mapping
81
80
 
 
81
    def make_working_trees(self):
 
82
        return True
82
83
 
83
84
 
84
85
class LocalGitRepository(GitRepository):
169
170
 
170
171
    def get_revision(self, revision_id):
171
172
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
172
 
        commit = self._git.commit(git_commit_id)
 
173
        try:
 
174
            commit = self._git.commit(git_commit_id)
 
175
        except KeyError:
 
176
            raise errors.NoSuchRevision(self, revision_id)
173
177
        # print "fetched revision:", git_commit_id
174
 
        if commit is None:
175
 
            raise errors.NoSuchRevision(self, revision_id)
176
 
        revision = self._parse_rev(commit, self.get_mapping())
 
178
        revision = self.get_mapping().import_commit(commit)
177
179
        assert revision is not None
178
180
        return revision
179
181
 
188
190
    def get_revisions(self, revids):
189
191
        return [self.get_revision(r) for r in revids]
190
192
 
191
 
    @classmethod
192
 
    def _parse_rev(klass, commit, mapping):
193
 
        """Convert a git commit to a bzr revision.
194
 
 
195
 
        :return: a `bzrlib.revision.Revision` object.
196
 
        """
197
 
        if commit is None:
198
 
            raise AssertionError("Commit object can't be None")
199
 
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
200
 
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
201
 
        rev.message = commit.message.decode("utf-8", "replace")
202
 
        rev.committer = str(commit.committer).decode("utf-8", "replace")
203
 
        if commit.committer != commit.author:
204
 
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
205
 
        rev.timestamp = commit.commit_time
206
 
        rev.timezone = 0
207
 
        return rev
208
 
 
209
193
    def revision_trees(self, revids):
210
194
        for revid in revids:
211
195
            yield self.revision_tree(revid)
218
202
            inv.revision_id = revision_id
219
203
            return revisiontree.RevisionTree(self, inv, revision_id)
220
204
 
221
 
        return GitRevisionTree(self, revision_id)
 
205
        return GitRevisionTree(self, self.get_mapping(), revision_id)
222
206
 
223
207
    def get_inventory(self, revision_id):
224
208
        assert revision_id != None
227
211
    def set_make_working_trees(self, trees):
228
212
        pass
229
213
 
230
 
    def fetch_pack(self, determine_wants, graph_walker, pack_data):
231
 
        raise NotImplementedError(self.fetch_pack)
232
 
 
233
 
 
234
 
def escape_file_id(file_id):
235
 
    return file_id.replace('_', '__').replace(' ', '_s')
236
 
 
237
 
 
238
 
def unescape_file_id(file_id):
239
 
    return file_id.replace("_s", " ").replace("__", "_")
 
214
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
 
215
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
240
216
 
241
217
 
242
218
class GitRevisionTree(revisiontree.RevisionTree):
243
219
 
244
 
    def __init__(self, repository, revision_id):
 
220
    def __init__(self, repository, mapping, revision_id):
245
221
        self._repository = repository
246
222
        self.revision_id = revision_id
247
 
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
248
 
        self.tree = repository._git.commit(git_id).tree
 
223
        assert isinstance(revision_id, str)
 
224
        self.mapping = mapping
 
225
        git_id = repository.lookup_git_revid(revision_id, self.mapping)
 
226
        try:
 
227
            commit = repository._git.commit(git_id)
 
228
        except KeyError, r:
 
229
            raise errors.NoSuchRevision(repository, revision_id)
 
230
        self.tree = commit.tree
249
231
        self._inventory = inventory.Inventory(revision_id=revision_id)
250
232
        self._inventory.root.revision = revision_id
251
233
        self._build_inventory(self.tree, self._inventory.root, "")
267
249
                child_path = name
268
250
            else:
269
251
                child_path = urlutils.join(path, name)
270
 
            file_id = escape_file_id(child_path.encode('utf-8'))
 
252
            file_id = self.mapping.generate_file_id(child_path)
271
253
            entry_kind = (mode & 0700000) / 0100000
272
254
            if entry_kind == 0:
273
255
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)