/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 new bzr-foreign.

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