/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

Partially fix pull.

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
    )
26
27
from bzrlib.trace import mutter
27
28
 
28
29
from bzrlib.plugins.git.foreign import ForeignBranch
 
30
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
29
31
 
30
32
from dulwich.objects import (
31
33
        Commit,
63
65
        # do not provide a BranchDataConfig
64
66
        self.option_sources = self.option_sources[0], self.option_sources[2]
65
67
 
66
 
    def set_user_option(self, name, value, local=False):
 
68
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
67
69
        """Force local to True"""
68
 
        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)
69
71
 
70
72
 
71
73
class GitBranchFormat(branch.BranchFormat):
90
92
        self.base = bzrdir.transport.base
91
93
        self._format = GitBranchFormat()
92
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
 
93
103
    def lock_write(self):
94
104
        self.control_files.lock_write()
95
105
 
123
133
            return revision.NULL_REVISION
124
134
        return self.mapping.revision_id_foreign_to_bzr(self.head)
125
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
 
126
160
    def _make_tags(self):
127
161
        return GitTagDict(self)
128
162
 
144
178
    def set_push_location(self, location):
145
179
        """See Branch.set_push_location."""
146
180
        self.get_config().set_user_option('push_location', location,
147
 
                                          local=True)
 
181
                                          store=config.STORE_LOCATION)
148
182
 
149
183
    def supports_tags(self):
150
184
        return True
156
190
        result.set_parent(self.bzrdir.root_transport.base)
157
191
        return result
158
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)