/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 branch.py

Add more tests for fetch code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
1
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
16
17
 
17
18
"""An adapter between a Git Branch and a Bazaar Branch"""
18
19
 
 
20
from dulwich.objects import (
 
21
    Commit,
 
22
    Tag,
 
23
    )
 
24
 
19
25
from bzrlib import (
20
26
    branch,
21
27
    config,
 
28
    repository,
22
29
    revision,
23
30
    tag,
24
31
    )
25
 
from bzrlib.decorators import needs_read_lock
26
 
from bzrlib.trace import mutter
27
 
 
28
 
from bzrlib.plugins.git.foreign import ForeignBranch
29
 
 
30
 
from dulwich.objects import (
31
 
        Commit,
32
 
        Tag,
33
 
        )
34
 
 
35
 
class GitTagDict(tag.BasicTags):
 
32
from bzrlib.decorators import (
 
33
    needs_read_lock,
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
 
 
39
from bzrlib.plugins.git.foreign import (
 
40
    ForeignBranch,
 
41
    )
 
42
from bzrlib.plugins.git.errors import (
 
43
    LightWeightCheckoutsNotSupported,
 
44
    )
 
45
 
 
46
 
 
47
class LocalGitTagDict(tag.BasicTags):
 
48
    """Dictionary with tags in a local repository."""
36
49
 
37
50
    def __init__(self, branch):
38
51
        self.branch = branch
46
59
                v = obj.object[1]
47
60
                obj = self.repository._git.get_object(v)
48
61
            if not isinstance(obj, Commit):
49
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
62
                mutter("Tag %s points at object %r that is not a commit, "
 
63
                       "ignoring", k, obj)
50
64
                continue
51
65
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
52
66
        return ret
63
77
        # do not provide a BranchDataConfig
64
78
        self.option_sources = self.option_sources[0], self.option_sources[2]
65
79
 
66
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
80
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
 
81
            warn_masked=False):
67
82
        """Force local to True"""
68
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
83
        config.BranchConfig.set_user_option(self, name, value,
 
84
            store=config.STORE_LOCATION, warn_masked=warn_masked)
69
85
 
70
86
 
71
87
class GitBranchFormat(branch.BranchFormat):
76
92
    def supports_tags(self):
77
93
        return True
78
94
 
 
95
    def make_tags(self, branch):
 
96
        if getattr(branch.repository, "get_refs", None) is not None:
 
97
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
98
            return RemoteGitTagDict(branch)
 
99
        else:
 
100
            return LocalGitTagDict(branch)
 
101
 
79
102
 
80
103
class GitBranch(ForeignBranch):
81
104
    """An adapter to git repositories for bzr Branch objects."""
82
105
 
83
106
    def __init__(self, bzrdir, repository, name, head, lockfiles):
84
107
        self.repository = repository
 
108
        self._format = GitBranchFormat()
85
109
        super(GitBranch, self).__init__(repository.get_mapping())
86
110
        self.control_files = lockfiles
87
111
        self.bzrdir = bzrdir
88
112
        self.name = name
89
113
        self.head = head
90
114
        self.base = bzrdir.transport.base
91
 
        self._format = GitBranchFormat()
 
115
 
 
116
    def dpull(self, source, stop_revision=None):
 
117
        if stop_revision is None:
 
118
            stop_revision = source.last_revision()
 
119
        # FIXME: Check for diverged branches
 
120
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
121
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
 
122
            revidmap[stop_revision])
 
123
        return revidmap
92
124
 
93
125
    def lock_write(self):
94
126
        self.control_files.lock_write()
115
147
 
116
148
 
117
149
class LocalGitBranch(GitBranch):
 
150
    """A local Git branch."""
118
151
 
119
152
    @needs_read_lock
120
153
    def last_revision(self):
123
156
            return revision.NULL_REVISION
124
157
        return self.mapping.revision_id_foreign_to_bzr(self.head)
125
158
 
126
 
    def _make_tags(self):
127
 
        return GitTagDict(self)
 
159
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
160
        accelerator_tree=None, hardlink=False):
 
161
        if lightweight:
 
162
            raise LightWeightCheckoutsNotSupported()
 
163
        return self._create_heavyweight_checkout(to_location, revision_id,
 
164
            hardlink)
 
165
 
 
166
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
167
                                     hardlink=False):
 
168
        """Create a new heavyweight checkout of this branch.
 
169
 
 
170
        :param to_location: URL of location to create the new checkout in.
 
171
        :param revision_id: Revision that should be the tip of the checkout.
 
172
        :param hardlink: Whether to hardlink
 
173
        :return: WorkingTree object of checkout.
 
174
        """
 
175
        checkout_branch = BzrDir.create_branch_convenience(
 
176
            to_location, force_new_tree=False, format=get_rich_root_format())
 
177
        checkout = checkout_branch.bzrdir
 
178
        checkout_branch.bind(self)
 
179
        # pull up to the specified revision_id to set the initial 
 
180
        # branch tip correctly, and seed it with history.
 
181
        checkout_branch.pull(self, stop_revision=revision_id)
 
182
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
128
183
 
129
184
    def _gen_revision_history(self):
130
185
        if self.head is None:
131
186
            return []
132
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
187
        ret = list(self.repository.iter_reverse_revision_history(
 
188
            self.last_revision()))
133
189
        ret.reverse()
134
190
        return ret
135
191
 
149
205
    def supports_tags(self):
150
206
        return True
151
207
 
152
 
    def sprout(self, to_bzrdir, revision_id=None):
153
 
        """See Branch.sprout()."""
154
 
        result = to_bzrdir.create_branch()
155
 
        self.copy_content_into(result, revision_id=revision_id)
156
 
        result.set_parent(self.bzrdir.root_transport.base)
157
 
        return result
158
 
 
 
208
 
 
209
class InterGitGenericBranch(branch.InterBranch):
 
210
    """InterBranch implementation that pulls from Git into bzr."""
 
211
 
 
212
    @classmethod
 
213
    def is_compatible(self, source, target):
 
214
        return isinstance(source, GitBranch)
 
215
 
 
216
    def update_revisions(self, stop_revision=None, overwrite=False,
 
217
        graph=None):
 
218
        """See InterBranch.update_revisions()."""
 
219
        # TODO: stop_revision, overwrite
 
220
        interrepo = repository.InterRepository.get(self.source.repository, 
 
221
            self.target.repository)
 
222
        self._last_revid = None
 
223
        def determine_wants(heads):
 
224
            if not self.source.name in heads:
 
225
                raise BzrError("No such remote branch '%s', found: %r" % (
 
226
                    self.source.name, heads.keys()))
 
227
            head = heads[self.source.name]
 
228
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
229
                head)
 
230
            if self.target.repository.has_revision(self._last_revid):
 
231
                return []
 
232
            return [head]
 
233
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
234
        self.target.generate_revision_history(self._last_revid)
 
235
 
 
236
 
 
237
branch.InterBranch.register_optimiser(InterGitGenericBranch)