/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

Partially fix pull.

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,
25
24
    errors,
26
25
    graph,
27
26
    inventory,
29
28
    repository,
30
29
    revision,
31
30
    revisiontree,
 
31
    ui,
32
32
    urlutils,
33
 
    versionedfile,
34
33
    )
35
34
from bzrlib.foreign import (
36
35
        ForeignRepository,
37
 
        ForeignRevision,
38
36
        )
39
37
from bzrlib.trace import mutter
40
38
from bzrlib.transport import get_transport
42
40
from bzrlib.plugins.git.foreign import (
43
41
    versionedfiles,
44
42
    )
45
 
from bzrlib.plugins.git.mapping import default_mapping
 
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
46
45
 
47
 
from bzrlib.plugins.git import git
 
46
import dulwich as git
48
47
 
49
48
 
50
49
class GitTags(object):
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)
 
98
        self.inventories = versionedfiles.VirtualInventoryTexts(self)
 
99
        self.texts = GitTexts(self)
75
100
        self.tags = GitTags(self._git.get_tags())
76
 
        from bzrlib.plugins.git import fetch
77
 
        repository.InterRepository.register_optimiser(fetch.InterFromGitRepository)
78
101
 
79
102
    def all_revision_ids(self):
80
103
        ret = set([revision.NULL_REVISION])
87
110
            ret.add(rev)
88
111
        return ret
89
112
 
90
 
    def is_shared(self):
91
 
        return True
92
 
 
93
 
    def supports_rich_root(self):
94
 
        return True
95
 
 
96
113
    #def get_revision_delta(self, revision_id):
97
114
    #    parent_revid = self.get_revision(revision_id).parent_ids[0]
98
115
    #    diff = self._git.diff(ids.convert_revision_id_bzr_to_git(parent_revid),
110
127
            if revision_id == revision.NULL_REVISION:
111
128
                parent_map[revision_id] = ()
112
129
                continue
113
 
            hexsha = self.lookup_git_revid(revision_id, self.get_mapping())
 
130
            hexsha, mapping = self.lookup_git_revid(revision_id)
114
131
            commit  = self._git.commit(hexsha)
115
132
            if commit is None:
116
133
                continue
117
134
            else:
118
 
                parent_map[revision_id] = [self.get_mapping().revision_id_foreign_to_bzr(p) for p in commit.parents]
 
135
                parent_map[revision_id] = [mapping.revision_id_foreign_to_bzr(p) for p in commit.parents]
119
136
        return parent_map
120
137
 
121
138
    def get_ancestry(self, revision_id, topo_sorted=True):
133
150
        ancestry.reverse()
134
151
        return ancestry
135
152
 
136
 
    def _warn_if_deprecated(self):
137
 
        # This class isn't deprecated
138
 
        pass
 
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
139
195
 
140
196
    def get_signature_text(self, revision_id):
141
197
        raise errors.NoSuchRevision(self, revision_id)
152
208
    def has_signature_for_revision_id(self, revision_id):
153
209
        return False
154
210
 
155
 
    def get_mapping(self):
156
 
        return default_mapping
157
 
 
158
 
    def lookup_git_revid(self, bzr_revid, mapping):
 
211
    def lookup_git_revid(self, bzr_revid):
159
212
        try:
160
 
            return mapping.revision_id_bzr_to_foreign(bzr_revid)
 
213
            return mapping_registry.revision_id_bzr_to_foreign(bzr_revid)
161
214
        except errors.InvalidRevisionId:
162
215
            raise errors.NoSuchRevision(self, bzr_revid)
163
216
 
164
217
    def get_revision(self, revision_id):
165
 
        git_commit_id = self.lookup_git_revid(revision_id, self.get_mapping())
166
 
        commit = self._git.commit(git_commit_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:
 
222
            raise errors.NoSuchRevision(self, revision_id)
167
223
        # 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())
 
224
        revision = mapping.import_commit(commit)
171
225
        assert revision is not None
172
226
        return revision
173
227
 
182
236
    def get_revisions(self, revids):
183
237
        return [self.get_revision(r) for r in revids]
184
238
 
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
239
    def revision_trees(self, revids):
204
240
        for revid in revids:
205
241
            yield self.revision_tree(revid)
221
257
    def set_make_working_trees(self, trees):
222
258
        pass
223
259
 
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("__", "_")
 
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)
231
262
 
232
263
 
233
264
class GitRevisionTree(revisiontree.RevisionTree):
235
266
    def __init__(self, repository, revision_id):
236
267
        self._repository = repository
237
268
        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
 
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
240
276
        self._inventory = inventory.Inventory(revision_id=revision_id)
241
277
        self._inventory.root.revision = revision_id
242
278
        self._build_inventory(self.tree, self._inventory.root, "")
251
287
 
252
288
    def _build_inventory(self, tree_id, ie, path):
253
289
        assert isinstance(path, str)
254
 
        tree = self._repository._git.get_tree(tree_id)
 
290
        tree = self._repository._git.tree(tree_id)
255
291
        for mode, name, hexsha in tree.entries():
256
292
            basename = name.decode("utf-8")
257
293
            if path == "":
258
294
                child_path = name
259
295
            else:
260
296
                child_path = urlutils.join(path, name)
261
 
            file_id = escape_file_id(child_path.encode('utf-8'))
 
297
            file_id = self.mapping.generate_file_id(child_path)
262
298
            entry_kind = (mode & 0700000) / 0100000
263
299
            if entry_kind == 0:
264
300
                child_ie = inventory.InventoryDirectory(file_id, basename, ie.file_id)