/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 all tests but two, use rich roots by default.

Show diffs side-by-side

added added

removed removed

Lines of Context:
repository.py
23
23
from bzrlib import (
24
24
    deprecated_graph,
25
25
    errors,
26
 
    graph,
27
26
    inventory,
28
27
    osutils,
29
28
    repository,
33
32
    versionedfile,
34
33
    )
35
34
from bzrlib.foreign import (
36
 
        ForeignRepository,
 
35
        ForeignRevision,
37
36
        )
38
 
from bzrlib.trace import mutter
39
37
from bzrlib.transport import get_transport
40
38
 
41
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignRepository,
42
41
    versionedfiles,
43
42
    )
44
43
from bzrlib.plugins.git.mapping import default_mapping
62
61
 
63
62
    def __init__(self, gitdir, lockfiles):
64
63
        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
 
        # FIXME: This also caches negatives. Need to be more careful 
89
 
        # about this once we start writing to git
90
 
        self._parents_provider = graph.CachingParentsProvider(self)
91
 
        GitRepository.__init__(self, gitdir, lockfiles)
92
64
        self.base = gitdir.root_transport.base
 
65
        self.bzrdir = gitdir
93
66
        self._git = gitdir._git
94
67
        self.texts = None
95
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
107
80
            ret.add(rev)
108
81
        return ret
109
82
 
 
83
    def is_shared(self):
 
84
        return True
 
85
 
 
86
    def supports_rich_root(self):
 
87
        return True
 
88
 
110
89
    #def get_revision_delta(self, revision_id):
111
90
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
112
91
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
113
92
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
114
93
 
115
 
    def _make_parents_provider(self):
116
 
        """See Repository._make_parents_provider()."""
117
 
        return self._parents_provider
118
 
 
119
94
    def get_parent_map(self, revids):
120
95
        parent_map = {}
121
 
        mutter("get_parent_map(%r)", revids)
122
96
        for revision_id in revids:
123
97
            assert isinstance(revision_id, str)
124
98
            if revision_id == revision.NULL_REVISION:
162
136
    def has_signature_for_revision_id(self, revision_id):
163
137
        return False
164
138
 
 
139
    def get_mapping(self):
 
140
        return default_mapping
 
141
 
165
142
    def lookup_git_revid(self, bzr_revid, mapping):
166
143
        try:
167
144
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
170
147
 
171
148
    def get_revision(self, revision_id):
172
149
        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:
 
150
        commit = self._git.commit(git_commit_id)
 
151
        # print "fetched revision:", git_commit_id
 
152
        if commit is None:
176
153
            raise errors.NoSuchRevision(self, revision_id)
177
 
        # print "fetched revision:", git_commit_id
178
 
        revision = self.get_mapping().import_commit(commit)
 
154
        revision = self._parse_rev(commit, self.get_mapping())
179
155
        assert revision is not None
180
156
        return revision
181
157
 
188
164
            return True
189
165
 
190
166
    def get_revisions(self, revids):
191
 
        return [self.get_revision(r) for r in revids]
 
167
        return (self.get_revision(r) for r in revids)
 
168
 
 
169
    @classmethod
 
170
    def _parse_rev(klass, commit, mapping):
 
171
        """Convert a git commit to a bzr revision.
 
172
 
 
173
        :return: a `bzrlib.revision.Revision` object.
 
174
        """
 
175
        if commit is None:
 
176
            raise AssertionError("Commit object can't be None")
 
177
        rev = ForeignRevision(commit.id, mapping, mapping.revision_id_foreign_to_bzr(commit.id))
 
178
        rev.parent_ids = tuple([mapping.revision_id_foreign_to_bzr(p.id) for p in commit.parents])
 
179
        rev.message = commit.message.decode("utf-8", "replace")
 
180
        rev.committer = str(commit.committer).decode("utf-8", "replace")
 
181
        rev.properties['author'] = str(commit.author).decode("utf-8", "replace")
 
182
        rev.timestamp = commit.commit_time
 
183
        rev.timezone = 0
 
184
        return rev
192
185
 
193
186
    def revision_trees(self, revids):
194
187
        for revid in revids:
202
195
            inv.revision_id = revision_id
203
196
            return revisiontree.RevisionTree(self, inv, revision_id)
204
197
 
205
 
        return GitRevisionTree(self, self.get_mapping(), revision_id)
 
198
        return GitRevisionTree(self, revision_id)
206
199
 
207
200
    def get_inventory(self, revision_id):
208
201
        assert revision_id != None
211
204
    def set_make_working_trees(self, trees):
212
205
        pass
213
206
 
214
 
    def fetch_objects(self, determine_wants, graph_walker, progress=None):
215
 
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
 
207
 
 
208
def escape_file_id(file_id):
 
209
    return file_id.replace('_', '__').replace(' ', '_s')
 
210
 
 
211
 
 
212
def unescape_file_id(file_id):
 
213
    return file_id.replace("_s", " ").replace("__", "_")
216
214
 
217
215
 
218
216
class GitRevisionTree(revisiontree.RevisionTree):
219
217
 
220
 
    def __init__(self, repository, mapping, revision_id):
 
218
    def __init__(self, repository, revision_id):
221
219
        self._repository = repository
222
220
        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
 
221
        git_id = repository.lookup_git_revid(revision_id, repository.get_mapping())
 
222
        self.tree = repository._git.commit(git_id).tree
231
223
        self._inventory = inventory.Inventory(revision_id=revision_id)
232
224
        self._inventory.root.revision = revision_id
233
225
        self._build_inventory(self.tree, self._inventory.root, "")
242
234
 
243
235
    def _build_inventory(self, tree_id, ie, path):
244
236
        assert isinstance(path, str)
245
 
        tree = self._repository._git.tree(tree_id)
 
237
        tree = self._repository._git.get_tree(tree_id)
246
238
        for mode, name, hexsha in tree.entries():
247
239
            basename = name.decode("utf-8")
248
240
            if path == "":
249
241
                child_path = name
250
242
            else:
251
243
                child_path = urlutils.join(path, name)
252
 
            file_id = self.mapping.generate_file_id(child_path)
 
244
            file_id = escape_file_id(child_path.encode('utf-8'))
253
245
            entry_kind = (mode & 0700000) / 0100000
254
246
            if entry_kind == 0:
255
247
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
281
273
class GitFormat(object):
282
274
 
283
275
    supports_tree_reference = False
284
 
    rich_root_data = True
285
276
 
286
277
    def get_format_description(self):
287
278
        return "Git Repository"
288
 
 
289
 
    def initialize(self, url, shared=False, _internal=False):
290
 
        raise bzr_errors.UninitializableFormat(self)
291
 
 
292
 
    def check_conversion_target(self, target_repo_format):
293
 
        return target_repo_format.rich_root_data