/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
1
1
# Copyright (C) 2007 Canonical Ltd
2
 
# Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@samba.org>
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
17
16
 
18
17
"""An adapter between a Git Repository and a Bazaar Branch"""
19
18
 
 
19
import os
 
20
import time
 
21
 
20
22
import bzrlib
21
23
from bzrlib import (
22
24
    errors,
30
32
    urlutils,
31
33
    )
32
34
from bzrlib.foreign import (
33
 
    ForeignRepository,
34
 
    )
35
 
from bzrlib.trace import (
36
 
    mutter,
37
 
    )
38
 
from bzrlib.transport import (
39
 
    get_transport,
40
 
    )
 
35
        ForeignRepository,
 
36
        )
 
37
from bzrlib.trace import mutter
 
38
from bzrlib.transport import get_transport
41
39
 
42
40
from bzrlib.plugins.git.foreign import (
43
41
    versionedfiles,
44
42
    )
45
 
from bzrlib.plugins.git.mapping import (
46
 
    default_mapping,
47
 
    inventory_to_tree_and_blobs,
48
 
    mapping_registry,
49
 
    revision_to_commit,
50
 
    )
51
 
from bzrlib.plugins.git.versionedfiles import (
52
 
    GitTexts,
53
 
    )
 
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
54
45
 
55
46
import dulwich as git
56
 
import os
57
 
import time
58
47
 
59
48
 
60
49
class GitTags(object):
72
61
    _serializer = None
73
62
 
74
63
    def __init__(self, gitdir, lockfiles):
75
 
        ForeignRepository.__init__(self, GitRepositoryFormat(), gitdir, 
76
 
            lockfiles)
77
 
        from bzrlib.plugins.git import fetch, push
78
 
        for optimiser in [fetch.InterGitRepository, 
79
 
                          fetch.InterGitNonGitRepository,
80
 
                          push.InterToGitRepository]:
81
 
            repository.InterRepository.register_optimiser(optimiser)
 
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)
82
68
 
83
69
    def is_shared(self):
84
70
        return True
98
84
 
99
85
 
100
86
class LocalGitRepository(GitRepository):
101
 
    """Git repository on the file system."""
102
87
 
103
88
    def __init__(self, gitdir, lockfiles):
104
89
        # FIXME: This also caches negatives. Need to be more careful 
116
101
 
117
102
    def all_revision_ids(self):
118
103
        ret = set([revision.NULL_REVISION])
119
 
        heads = self._git.heads()
120
 
        if heads == {}:
 
104
        if self._git.heads() == []:
121
105
            return ret
122
 
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in heads.itervalues()]
 
106
        bzr_heads = [self.get_mapping().revision_id_foreign_to_bzr(h) for h in self._git.heads()]
123
107
        ret = set(bzr_heads)
124
108
        graph = self.get_graph()
125
109
        for rev, parents in graph.iter_ancestry(bzr_heads):
155
139
        """See Repository.get_ancestry().
156
140
        """
157
141
        if revision_id is None:
158
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
142
            return self._all_revision_ids()
159
143
        assert isinstance(revision_id, str)
160
144
        ancestry = []
161
145
        graph = self.get_graph()
162
146
        for rev, parents in graph.iter_ancestry([revision_id]):
 
147
            if rev == revision.NULL_REVISION:
 
148
                rev = None
163
149
            ancestry.append(rev)
164
150
        ancestry.reverse()
165
 
        return [None] + ancestry
 
151
        return ancestry
166
152
 
167
153
    def import_revision_gist(self, source, revid, parent_lookup):
168
 
        """Import the gist of a revision into this Git repository.
 
154
        """Impor the gist of another revision into this Git repository.
169
155
 
170
156
        """
171
157
        objects = []
180
166
        return commit.sha().hexdigest()
181
167
 
182
168
    def dfetch(self, source, stop_revision):
183
 
        """Import the gist of the ancestry of a particular revision."""
184
169
        if stop_revision is None:
185
170
            raise NotImplementedError
186
171
        revidmap = {}
187
172
        gitidmap = {}
188
 
        def parent_lookup(revid):
189
 
            try:
190
 
                return gitidmap[revid]
191
 
            except KeyError:
192
 
                return self.lookup_git_revid(revid)[0]
193
173
        todo = []
194
174
        source.lock_write()
195
175
        try:
202
182
            try:
203
183
                for i, revid in enumerate(todo):
204
184
                    pb.update("pushing revisions", i, len(todo))
205
 
                    git_commit = self.import_revision_gist(source, revid,
206
 
                        parent_lookup)
 
185
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
207
186
                    gitidmap[revid] = git_commit
208
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(
209
 
                        git_commit)
 
187
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
210
188
                    revidmap[revid] = git_revid
211
189
            finally:
212
190
                pb.finished()
264
242
 
265
243
    def revision_tree(self, revision_id):
266
244
        revision_id = revision.ensure_null(revision_id)
 
245
 
267
246
        if revision_id == revision.NULL_REVISION:
268
247
            inv = inventory.Inventory(root_id=None)
269
248
            inv.revision_id = revision_id
270
249
            return revisiontree.RevisionTree(self, inv, revision_id)
 
250
 
271
251
        return GitRevisionTree(self, revision_id)
272
252
 
273
253
    def get_inventory(self, revision_id):
277
257
    def set_make_working_trees(self, trees):
278
258
        pass
279
259
 
280
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
281
 
        progress=None):
 
260
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
282
261
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
283
262
 
284
263
 
344
323
                self._build_inventory(hexsha, child_ie, child_path)
345
324
 
346
325
 
347
 
class GitRepositoryFormat(repository.RepositoryFormat):
 
326
class GitFormat(object):
348
327
 
349
328
    supports_tree_reference = False
350
329
    rich_root_data = True