/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 pull from remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
19
19
from bzrlib import (
20
20
    branch,
21
21
    config,
 
22
    repository,
22
23
    revision,
23
24
    tag,
24
25
    )
25
26
from bzrlib.decorators import needs_read_lock
 
27
from bzrlib.trace import mutter
26
28
 
27
29
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
from bzrlib.plugins.git.mapping import default_mapping
 
30
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
 
31
 
 
32
from dulwich.objects import (
 
33
        Commit,
 
34
        Tag,
 
35
        )
29
36
 
30
37
class GitTagDict(tag.BasicTags):
31
38
 
35
42
 
36
43
    def get_tag_dict(self):
37
44
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
45
        for k,v in self.repository._git.tags.iteritems():
 
46
            obj = self.repository._git.get_object(v)
 
47
            while isinstance(obj, Tag):
 
48
                v = obj.object[1]
 
49
                obj = self.repository._git.get_object(v)
 
50
            if not isinstance(obj, Commit):
 
51
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
52
                continue
 
53
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
54
        return ret
41
55
 
42
56
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
57
        self.repository._git.tags[name] = revid
44
58
 
45
59
 
46
60
class GitBranchConfig(config.BranchConfig):
51
65
        # do not provide a BranchDataConfig
52
66
        self.option_sources = self.option_sources[0], self.option_sources[2]
53
67
 
54
 
    def set_user_option(self, name, value, local=False):
 
68
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
55
69
        """Force local to True"""
56
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
70
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
57
71
 
58
72
 
59
73
class GitBranchFormat(branch.BranchFormat):
70
84
 
71
85
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
86
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
87
        super(GitBranch, self).__init__(repository.get_mapping())
74
88
        self.control_files = lockfiles
75
89
        self.bzrdir = bzrdir
76
90
        self.name = name
78
92
        self.base = bzrdir.transport.base
79
93
        self._format = GitBranchFormat()
80
94
 
 
95
    def dpull(self, source, stop_revision=None):
 
96
        if stop_revision is None:
 
97
            stop_revision = source.last_revision()
 
98
        # FIXME: Check for diverged branches
 
99
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
100
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
101
        return revidmap
 
102
 
81
103
    def lock_write(self):
82
104
        self.control_files.lock_write()
83
105
 
89
111
        """See Branch.get_parent()."""
90
112
        return None
91
113
 
 
114
    def set_parent(self, url):
 
115
        pass
 
116
 
92
117
    def lock_read(self):
93
118
        self.control_files.lock_read()
94
119
 
108
133
            return revision.NULL_REVISION
109
134
        return self.mapping.revision_id_foreign_to_bzr(self.head)
110
135
 
 
136
    def create_checkout(self, to_location, revision_id=None, 
 
137
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
138
        if lightweight:
 
139
            raise LightWeightCheckoutsNotSupported()
 
140
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
141
 
 
142
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
143
                                     hardlink=False):
 
144
        """Create a new heavyweight checkout of this branch.
 
145
 
 
146
        :param to_location: URL of location to create the new checkout in.
 
147
        :param revision_id: Revision that should be the tip of the checkout.
 
148
        :param hardlink: Whether to hardlink
 
149
        :return: WorkingTree object of checkout.
 
150
        """
 
151
        checkout_branch = BzrDir.create_branch_convenience(
 
152
            to_location, force_new_tree=False, format=get_rich_root_format())
 
153
        checkout = checkout_branch.bzrdir
 
154
        checkout_branch.bind(self)
 
155
        # pull up to the specified revision_id to set the initial 
 
156
        # branch tip correctly, and seed it with history.
 
157
        checkout_branch.pull(self, stop_revision=revision_id)
 
158
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
 
159
 
111
160
    def _make_tags(self):
112
161
        return GitTagDict(self)
113
162
 
129
178
    def set_push_location(self, location):
130
179
        """See Branch.set_push_location."""
131
180
        self.get_config().set_user_option('push_location', location,
132
 
                                          local=True)
 
181
                                          store=config.STORE_LOCATION)
133
182
 
134
183
    def supports_tags(self):
135
184
        return True
141
190
        result.set_parent(self.bzrdir.root_transport.base)
142
191
        return result
143
192
 
 
193
 
 
194
class InterGitGenericBranch(branch.InterBranch):
 
195
 
 
196
    @classmethod
 
197
    def is_compatible(self, source, target):
 
198
        return isinstance(source, GitBranch)
 
199
 
 
200
    def update_revisions(self, stop_revision=None, overwrite=False,
 
201
        graph=None):
 
202
        """See InterBranch.update_revisions()."""
 
203
        # TODO: stop_revision, overwrite
 
204
        interrepo = repository.InterRepository.get(self.source.repository, self.target.repository)
 
205
        self._last_revid = None
 
206
        def determine_wants(heads):
 
207
            if not self.source.name in heads:
 
208
                raise BzrError("No such remote branch '%s', found: %r" % (
 
209
                    self.source.name, heads.keys()))
 
210
            head = heads[self.source.name]
 
211
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(head)
 
212
            if self.target.repository.has_revision(self._last_revid):
 
213
                return []
 
214
            return [head]
 
215
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
216
        self.target.generate_revision_history(self._last_revid)
 
217
 
 
218
 
 
219
branch.InterBranch.register_optimiser(InterGitGenericBranch)