/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

Unmark as deprecated.

Show diffs side-by-side

added added

removed removed

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