/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.InterRemoteGitNonGitRepository, 
79
 
                          fetch.InterLocalGitNonGitRepository,
80
 
                          fetch.InterGitRepository,
81
 
                          push.InterToGitRepository]:
82
 
            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)
83
68
 
84
69
    def is_shared(self):
85
70
        return True
99
84
 
100
85
 
101
86
class LocalGitRepository(GitRepository):
102
 
    """Git repository on the file system."""
103
87
 
104
88
    def __init__(self, gitdir, lockfiles):
105
89
        # FIXME: This also caches negatives. Need to be more careful 
117
101
 
118
102
    def all_revision_ids(self):
119
103
        ret = set([revision.NULL_REVISION])
120
 
        heads = self._git.heads()
121
 
        if heads == {}:
 
104
        if self._git.heads() == []:
122
105
            return ret
123
 
        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()]
124
107
        ret = set(bzr_heads)
125
108
        graph = self.get_graph()
126
109
        for rev, parents in graph.iter_ancestry(bzr_heads):
156
139
        """See Repository.get_ancestry().
157
140
        """
158
141
        if revision_id is None:
159
 
            return [None, revision.NULL_REVISION] + self._all_revision_ids()
 
142
            return self._all_revision_ids()
160
143
        assert isinstance(revision_id, str)
161
144
        ancestry = []
162
145
        graph = self.get_graph()
163
146
        for rev, parents in graph.iter_ancestry([revision_id]):
 
147
            if rev == revision.NULL_REVISION:
 
148
                rev = None
164
149
            ancestry.append(rev)
165
150
        ancestry.reverse()
166
 
        return [None] + ancestry
 
151
        return ancestry
167
152
 
168
153
    def import_revision_gist(self, source, revid, parent_lookup):
169
 
        """Import the gist of a revision into this Git repository.
 
154
        """Impor the gist of another revision into this Git repository.
170
155
 
171
156
        """
172
157
        objects = []
181
166
        return commit.sha().hexdigest()
182
167
 
183
168
    def dfetch(self, source, stop_revision):
184
 
        """Import the gist of the ancestry of a particular revision."""
185
169
        if stop_revision is None:
186
170
            raise NotImplementedError
187
171
        revidmap = {}
188
172
        gitidmap = {}
189
 
        def parent_lookup(revid):
190
 
            try:
191
 
                return gitidmap[revid]
192
 
            except KeyError:
193
 
                return self.lookup_git_revid(revid)[0]
194
173
        todo = []
195
174
        source.lock_write()
196
175
        try:
203
182
            try:
204
183
                for i, revid in enumerate(todo):
205
184
                    pb.update("pushing revisions", i, len(todo))
206
 
                    git_commit = self.import_revision_gist(source, revid,
207
 
                        parent_lookup)
 
185
                    git_commit = self.import_revision_gist(source, revid, gitidmap.__getitem__)
208
186
                    gitidmap[revid] = git_commit
209
 
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(
210
 
                        git_commit)
 
187
                    git_revid = self.get_mapping().revision_id_foreign_to_bzr(git_commit)
211
188
                    revidmap[revid] = git_revid
212
189
            finally:
213
190
                pb.finished()
265
242
 
266
243
    def revision_tree(self, revision_id):
267
244
        revision_id = revision.ensure_null(revision_id)
 
245
 
268
246
        if revision_id == revision.NULL_REVISION:
269
247
            inv = inventory.Inventory(root_id=None)
270
248
            inv.revision_id = revision_id
271
249
            return revisiontree.RevisionTree(self, inv, revision_id)
 
250
 
272
251
        return GitRevisionTree(self, revision_id)
273
252
 
274
253
    def get_inventory(self, revision_id):
278
257
    def set_make_working_trees(self, trees):
279
258
        pass
280
259
 
281
 
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref,
282
 
        progress=None):
 
260
    def fetch_objects(self, determine_wants, graph_walker, resolve_ext_ref, progress=None):
283
261
        return self._git.fetch_objects(determine_wants, graph_walker, progress)
284
262
 
285
263
 
287
265
 
288
266
    def __init__(self, repository, revision_id):
289
267
        self._repository = repository
290
 
        self._revision_id = revision_id
 
268
        self.revision_id = revision_id
291
269
        assert isinstance(revision_id, str)
292
270
        git_id, self.mapping = repository.lookup_git_revid(revision_id)
293
271
        try:
300
278
        self._build_inventory(self.tree, self._inventory.root, "")
301
279
 
302
280
    def get_revision_id(self):
303
 
        return self._revision_id
 
281
        return self.revision_id
304
282
 
305
283
    def get_file_text(self, file_id):
306
284
        entry = self._inventory[file_id]
328
306
                    child_ie.text_sha1 = osutils.sha_string(b.data)
329
307
                elif file_kind == 2:
330
308
                    child_ie = inventory.InventoryLink(file_id, basename, ie.file_id)
331
 
                    child_ie.symlink_target = b.data
332
309
                    child_ie.text_sha1 = osutils.sha_string("")
333
310
                else:
334
311
                    raise AssertionError(
340
317
                    "Unknown blob kind, perms=%r." % (mode,))
341
318
            fs_mode = mode & 0777
342
319
            child_ie.executable = bool(fs_mode & 0111)
343
 
            # TODO: This should be set to the revision id in which 
344
 
            # child_ie was last changed instead.
345
 
            child_ie.revision = self._revision_id
 
320
            child_ie.revision = self.revision_id
346
321
            self._inventory.add(child_ie)
347
322
            if entry_kind == 0:
348
323
                self._build_inventory(hexsha, child_ie, child_path)
349
324
 
350
325
 
351
 
class GitRepositoryFormat(repository.RepositoryFormat):
 
326
class GitFormat(object):
352
327
 
353
328
    supports_tree_reference = False
354
329
    rich_root_data = True