/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

Fix branch cloning.

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>
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 Branch and a Bazaar Branch"""
19
18
 
20
 
from dulwich.objects import (
21
 
    Commit,
22
 
    Tag,
23
 
    )
24
 
 
25
19
from bzrlib import (
26
20
    branch,
27
21
    config,
28
 
    repository,
29
22
    revision,
30
23
    tag,
31
24
    )
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."""
 
25
from bzrlib.decorators import needs_read_lock
 
26
 
 
27
from bzrlib.plugins.git.foreign import ForeignBranch
 
28
from bzrlib.plugins.git.mapping import default_mapping
 
29
 
 
30
class GitTagDict(tag.BasicTags):
49
31
 
50
32
    def __init__(self, branch):
51
33
        self.branch = branch
53
35
 
54
36
    def get_tag_dict(self):
55
37
        ret = {}
56
 
        for k,v in self.repository._git.tags.iteritems():
57
 
            obj = self.repository._git.get_object(v)
58
 
            while isinstance(obj, Tag):
59
 
                v = obj.object[1]
60
 
                obj = self.repository._git.get_object(v)
61
 
            if not isinstance(obj, Commit):
62
 
                mutter("Tag %s points at object %r that is not a commit, "
63
 
                       "ignoring", k, obj)
64
 
                continue
65
 
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
38
        for tag in self.repository._git.tags:
 
39
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
66
40
        return ret
67
41
 
68
42
    def set_tag(self, name, revid):
69
 
        self.repository._git.tags[name] = revid
 
43
        raise NotImplementedError(self.set_tag)
70
44
 
71
45
 
72
46
class GitBranchConfig(config.BranchConfig):
77
51
        # do not provide a BranchDataConfig
78
52
        self.option_sources = self.option_sources[0], self.option_sources[2]
79
53
 
80
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
81
 
            warn_masked=False):
 
54
    def set_user_option(self, name, value, local=False):
82
55
        """Force local to True"""
83
 
        config.BranchConfig.set_user_option(self, name, value,
84
 
            store=config.STORE_LOCATION, warn_masked=warn_masked)
 
56
        config.BranchConfig.set_user_option(self, name, value, local=True)
85
57
 
86
58
 
87
59
class GitBranchFormat(branch.BranchFormat):
92
64
    def supports_tags(self):
93
65
        return True
94
66
 
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
 
 
102
67
 
103
68
class GitBranch(ForeignBranch):
104
69
    """An adapter to git repositories for bzr Branch objects."""
105
70
 
106
71
    def __init__(self, bzrdir, repository, name, head, lockfiles):
107
72
        self.repository = repository
108
 
        self._format = GitBranchFormat()
109
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
73
        super(GitBranch, self).__init__(default_mapping)
110
74
        self.control_files = lockfiles
111
75
        self.bzrdir = bzrdir
112
76
        self.name = name
113
77
        self.head = head
114
78
        self.base = bzrdir.transport.base
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
 
79
        self._format = GitBranchFormat()
124
80
 
125
81
    def lock_write(self):
126
82
        self.control_files.lock_write()
133
89
        """See Branch.get_parent()."""
134
90
        return None
135
91
 
136
 
    def set_parent(self, url):
137
 
        pass
138
 
 
139
92
    def lock_read(self):
140
93
        self.control_files.lock_read()
141
94
 
147
100
 
148
101
 
149
102
class LocalGitBranch(GitBranch):
150
 
    """A local Git branch."""
151
103
 
152
104
    @needs_read_lock
153
105
    def last_revision(self):
156
108
            return revision.NULL_REVISION
157
109
        return self.mapping.revision_id_foreign_to_bzr(self.head)
158
110
 
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)
 
111
    def _make_tags(self):
 
112
        return GitTagDict(self)
183
113
 
184
114
    def _gen_revision_history(self):
185
115
        if self.head is None:
186
116
            return []
187
 
        ret = list(self.repository.iter_reverse_revision_history(
188
 
            self.last_revision()))
 
117
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
189
118
        ret.reverse()
190
119
        return ret
191
120
 
200
129
    def set_push_location(self, location):
201
130
        """See Branch.set_push_location."""
202
131
        self.get_config().set_user_option('push_location', location,
203
 
                                          store=config.STORE_LOCATION)
 
132
                                          local=True)
204
133
 
205
134
    def supports_tags(self):
206
135
        return True
207
136
 
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)
 
137
    def sprout(self, to_bzrdir, revision_id=None):
 
138
        """See Branch.sprout()."""
 
139
        result = to_bzrdir.create_branch()
 
140
        self.copy_content_into(result, revision_id=revision_id)
 
141
        result.set_parent(self.bzrdir.root_transport.base)
 
142
        return result
 
143