/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
21
21
 
22
22
import bzrlib
23
23
from bzrlib import (
 
24
    deprecated_graph,
24
25
    errors,
25
 
    graph,
26
26
    inventory,
27
27
    osutils,
28
28
    repository,
29
29
    revision,
30
30
    revisiontree,
31
 
    ui,
32
31
    urlutils,
 
32
    versionedfile,
33
33
    )
34
34
from bzrlib.foreign import (
35
 
        ForeignRepository,
 
35
        ForeignRevision,
36
36
        )
37
 
from bzrlib.trace import mutter
38
37
from bzrlib.transport import get_transport
39
38
 
40
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignRepository,
41
41
    versionedfiles,
42
42
    )
43
 
from bzrlib.plugins.git.mapping import default_mapping, mapping_registry, inventory_to_tree_and_blobs, revision_to_commit
44
 
from bzrlib.plugins.git.versionedfiles import GitTexts
 
43
from bzrlib.plugins.git.mapping import default_mapping
45
44
 
46
 
import dulwich as git
 
45
from bzrlib.plugins.git import git
47
46
 
48
47
 
49
48
class GitTags(object):
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
 
        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
 
        # FIXME: This also caches negatives. Need to be more careful 
90
 
        # about this once we start writing to git
91
 
        self._parents_provider = graph.CachingParentsProvider(self)
92
 
        GitRepository.__init__(self, gitdir, lockfiles)
93
64
        self.base = gitdir.root_transport.base
 
65
        self.bzrdir = gitdir
94
66
        self._git = gitdir._git
95
67
        self.texts = None
96
68
        self.signatures = versionedfiles.VirtualSignatureTexts(self)
97
69
        self.revisions = versionedfiles.VirtualRevisionTexts(self)
98
 
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
99
 
        self.texts = GitTexts(self)
100
70
        self.tags = GitTags(self._git.get_tags())
101
71
 
102
72
    def all_revision_ids(self):
110
80
            ret.add(rev)
111
81
        return ret
112
82
 
 
83
    def is_shared(self):
 
84
        return True
 
85
 
 
86
    def supports_rich_root(self):
 
87
        return True
 
88
 
113
89
    #def get_revision_delta(self, revision_id):
114
90
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
115
91
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
116
92
    #                   ids.convert_revision_id_bzr_to_git(revision_id))
117
93
 
118
 
    def _make_parents_provider(self):
119
 
        """See Repository._make_parents_provider()."""
120
 
        return self._parents_provider
121
 
 
122
94
    def get_parent_map(self, revids):
123
95
        parent_map = {}
124
 
        mutter("get_parent_map(%r)", revids)
125
96
        for revision_id in revids:
126
97
            assert isinstance(revision_id, str)
127
98
            if revision_id == revision.NULL_REVISION:
128
99
                parent_map[revision_id] = ()
129
100
                continue
130
 
            hexsha, mapping = self.lookup_git_revid(revision_id)
 
101
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
131
102
            commit  = self._git.commit(hexsha)
132
103
            if commit is None:
133
104
                continue
134
105
            else:
135
 
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
 
106
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
136
107
        return parent_map
137
108
 
138
109
    def get_ancestry(self, revision_id, topo_sorted=True):
150
121
        ancestry.reverse()
151
122
        return ancestry
152
123
 
153
 
    def import_revision_gist(self, source, revid, parent_lookup):
154
 
        """Impor the gist of another revision into this Git repository.
155
 
 
156
 
        """
157
 
        objects = []
158
 
        rev = source.get_revision(revid)
159
 
        for sha, object, path in inventory_to_tree_and_blobs(source, None, revid):
160
 
            if path == "":
161
 
                tree_sha = sha
162
 
            objects.append((object, path))
163
 
        commit = revision_to_commit(rev, tree_sha, parent_lookup)
164
 
        objects.append((commit, None))
165
 
        self._git.object_store.add_objects(objects)
166
 
        return commit.sha().hexdigest()
167
 
 
168
 
    def dfetch(self, source, stop_revision):
169
 
        if stop_revision is None:
170
 
            raise NotImplementedError
171
 
        revidmap = {}
172
 
        gitidmap = {}
173
 
        todo = []
174
 
        source.lock_write()
175
 
        try:
176
 
            graph = source.get_graph()
177
 
            ancestry = [x for x in source.get_ancestry(stop_revision) if x is not None]
178
 
            for revid in graph.iter_topo_order(ancestry):
179
 
                if not self.has_revision(revid):
180
 
                    todo.append(revid)
181
 
            pb = ui.ui_factory.nested_progress_bar()
182
 
            try:
183
 
                for i, revid in enumerate(todo):
184
 
                    pb.update("pushing revisions", i, len(todo))
185
 
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
186
 
                    gitidmap[revid] = git_commit
187
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
188
 
                    revidmap[revid] = git_revid
189
 
            finally:
190
 
                pb.finished()
191
 
            source.fetch(self, revision_id=revidmap[stop_revision])
192
 
        finally:
193
 
            source.unlock()
194
 
        return revidmap
195
 
 
196
124
    def get_signature_text(self, revision_id):
197
125
        raise errors.NoSuchRevision(self, revision_id)
198
126
 
208
136
    def has_signature_for_revision_id(self, revision_id):
209
137
        return False
210
138
 
211
 
    def lookup_git_revid(self, bzr_revid):
 
139
    def get_mapping(self):
 
140
        return default_mapping
 
141
 
 
142
    def lookup_git_revid(self, bzr_revid, mapping):
212
143
        try:
213
 
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
 
144
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
214
145
        except errors.InvalidRevisionId:
215
146
            raise errors.NoSuchRevision(self, bzr_revid)
216
147
 
217
148
    def get_revision(self, revision_id):
218
 
        git_commit_id, mapping = self.lookup_git_revid(revision_id)
219
 
        try:
220
 
            commit = self._git.commit(git_commit_id)
221
 
        except KeyError:
 
149
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
 
150
        commit = self._git.commit(git_commit_id)
 
151
        # print "fetched revision:", git_commit_id
 
152
        if commit is None:
222
153
            raise errors.NoSuchRevision(self, revision_id)
223
 
        # print "fetched revision:", git_commit_id
224
 
        revision = mapping.import_commit(commit)
 
154
        revision = self._parse_rev(commit, self.get_mapping())
225
155
        assert revision is not None
226
156
        return revision
227
157
 
234
164
            return True
235
165
 
236
166
    def get_revisions(self, revids):
237
 
        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
238
185
 
239
186
    def revision_trees(self, revids):
240
187
        for revid in revids:
257
204
    def set_make_working_trees(self, trees):
258
205
        pass
259
206
 
260
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
261
 
        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("__", "_")
262
214
 
263
215
 
264
216
class GitRevisionTree(revisiontree.RevisionTree):
266
218
    def __init__(self, repository, revision_id):
267
219
        self._repository = repository
268
220
        self.revision_id = revision_id
269
 
        assert isinstance(revision_id, str)
270
 
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
271
 
        try:
272
 
            commit = repository._git.commit(git_id)
273
 
        except KeyError, r:
274
 
            raise errors.NoSuchRevision(repository, revision_id)
275
 
        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
276
223
        self._inventory = inventory.Inventory(revision_id=revision_id)
277
224
        self._inventory.root.revision = revision_id
278
225
        self._build_inventory(self.tree, self._inventory.root, "")
287
234
 
288
235
    def _build_inventory(self, tree_id, ie, path):
289
236
        assert isinstance(path, str)
290
 
        tree = self._repository._git.tree(tree_id)
 
237
        tree = self._repository._git.get_tree(tree_id)
291
238
        for mode, name, hexsha in tree.entries():
292
239
            basename = name.decode("utf-8")
293
240
            if path == "":
294
241
                child_path = name
295
242
            else:
296
243
                child_path = urlutils.join(path, name)
297
 
            file_id = self.mapping.generate_file_id(child_path)
 
244
            file_id = escape_file_id(child_path.encode('utf-8'))
298
245
            entry_kind = (mode & 0700000) / 0100000
299
246
            if entry_kind == 0:
300
247
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)
326
273
class GitFormat(object):
327
274
 
328
275
    supports_tree_reference = False
329
 
    rich_root_data = True
330
276
 
331
277
    def get_format_description(self):
332
278
        return "Git Repository"
333
 
 
334
 
    def initialize(self, url, shared=False, _internal=False):
335
 
        raise bzr_errors.UninitializableFormat(self)
336
 
 
337
 
    def check_conversion_target(self, target_repo_format):
338
 
        return target_repo_format.rich_root_data