/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

Merge upstream.

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