/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
62
61
    _serializer = None
63
62
 
64
63
    def __init__(self, gitdir, lockfiles):
 
64
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
 
65
        from bzrlib.plugins.git import fetch
 
66
        repository.InterRepository.register_optimiser(fetch.InterGitRepository)
 
67
 
 
68
    def is_shared(self):
 
69
        return True
 
70
 
 
71
    def supports_rich_root(self):
 
72
        return True
 
73
 
 
74
    def _warn_if_deprecated(self):
 
75
        # This class isn't deprecated
 
76
        pass
 
77
 
 
78
    def get_mapping(self):
 
79
        return default_mapping
 
80
 
 
81
    def make_working_trees(self):
 
82
        return True
 
83
 
 
84
 
 
85
class LocalGitRepository(GitRepository):
 
86
 
 
87
    def __init__(self, gitdir, lockfiles):
65
88
        # FIXME: This also caches negatives. Need to be more careful 
66
89
        # about this once we start writing to git
67
90
        self._parents_provider = graph.CachingParentsProvider(self)
68
 
        ForeignRepository.__init__(self, GitFormat(), gitdir, lockfiles)
 
91
        GitRepository.__init__(self, gitdir, lockfiles)
69
92
        self.base = gitdir.root_transport.base
70
 
        self.bzrdir = gitdir
71
93
        self._git = gitdir._git
72
94
        self.texts = None
73
95
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
74
96
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
75
97
        self.tags = GitTags(self._git.get_tags())
76
 
        from bzrlib.plugins.git import fetch
77
 
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
78
98
 
79
99
    def all_revision_ids(self):
80
100
        ret = set([revision.NULL_REVISION])
87
107
            ret.add(rev)
88
108
        return ret
89
109
 
90
 
    def is_shared(self):
91
 
        return True
92
 
 
93
 
    def supports_rich_root(self):
94
 
        return True
95
 
 
96
110
    #def get_revision_delta(self, revision_id):
97
111
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
98
112
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
133
147
        ancestry.reverse()
134
148
        return ancestry
135
149
 
136
 
    def _warn_if_deprecated(self):
137
 
        # This class isn't deprecated
138
 
        pass
139
 
 
140
150
    def get_signature_text(self, revision_id):
141
151
        raise errors.NoSuchRevision(self, revision_id)
142
152
 
152
162
    def has_signature_for_revision_id(self, revision_id):
153
163
        return False
154
164
 
155
 
    def get_mapping(self):
156
 
        return default_mapping
157
 
 
158
165
    def lookup_git_revid(self, bzr_revid, mapping):
159
166
        try:
160
167
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
163
170
 
164
171
    def get_revision(self, revision_id):
165
172
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
166
 
        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)
167
177
        # print "fetched revision:", git_commit_id
168
 
        if commit is None:
169
 
            raise errors.NoSuchRevision(self, revision_id)
170
 
        revision = self._parse_rev(commit, self.get_mapping())
 
178
        revision = self.get_mapping().import_commit(commit)
171
179
        assert revision is not None
172
180
        return revision
173
181
 
182
190
    def get_revisions(self, revids):
183
191
        return [self.get_revision(r) for r in revids]
184
192
 
185
 
    @classmethod
186
 
    def _parse_rev(klass, commit, mapping):
187
 
        """Convert a git commit to a bzr revision.
188
 
 
189
 
        :return: a `bzrlib.revision.Revision` object.
190
 
        """
191
 
        if commit is None:
192
 
            raise AssertionError("Commit object can't be None")
193
 
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
194
 
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p) for p in commit.parents])
195
 
        rev.message = commit.message.decode("utf-8", "replace")
196
 
        rev.committer = str(commit.committer).decode("utf-8", "replace")
197
 
        if commit.committer != commit.author:
198
 
            rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
199
 
        rev.timestamp = commit.commit_time
200
 
        rev.timezone = 0
201
 
        return rev
202
 
 
203
193
    def revision_trees(self, revids):
204
194
        for revid in revids:
205
195
            yield self.revision_tree(revid)
212
202
            inv.revision_id = revision_id
213
203
            return revisiontree.RevisionTree(self, inv, revision_id)
214
204
 
215
 
        return GitRevisionTree(self, revision_id)
 
205
        return GitRevisionTree(self, self.get_mapping(), revision_id)
216
206
 
217
207
    def get_inventory(self, revision_id):
218
208
        assert revision_id != None
221
211
    def set_make_working_trees(self, trees):
222
212
        pass
223
213
 
224
 
 
225
 
def escape_file_id(file_id):
226
 
    return file_id.replace('_', '__').replace(' ', '_s')
227
 
 
228
 
 
229
 
def unescape_file_id(file_id):
230
 
    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)
231
216
 
232
217
 
233
218
class GitRevisionTree(revisiontree.RevisionTree):
234
219
 
235
 
    def __init__(self, repository, revision_id):
 
220
    def __init__(self, repository, mapping, revision_id):
236
221
        self._repository = repository
237
222
        self.revision_id = revision_id
238
 
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
239
 
        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
240
231
        self._inventory = inventory.Inventory(revision_id=revision_id)
241
232
        self._inventory.root.revision = revision_id
242
233
        self._build_inventory(self.tree, self._inventory.root, "")
251
242
 
252
243
    def _build_inventory(self, tree_id, ie, path):
253
244
        assert isinstance(path, str)
254
 
        tree = self._repository._git.get_tree(tree_id)
 
245
        tree = self._repository._git.tree(tree_id)
255
246
        for mode, name, hexsha in tree.entries():
256
247
            basename = name.decode("utf-8")
257
248
            if path == "":
258
249
                child_path = name
259
250
            else:
260
251
                child_path = urlutils.join(path, name)
261
 
            file_id = escape_file_id(child_path.encode('utf-8'))
 
252
            file_id = self.mapping.generate_file_id(child_path)
262
253
            entry_kind = (mode & 0700000) / 0100000
263
254
            if entry_kind == 0:
264
255
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)