/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 basic infrastructure for dpush.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
26
26
from bzrlib.trace import mutter
27
27
 
28
28
from bzrlib.plugins.git.foreign import ForeignBranch
 
29
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
29
30
 
30
31
from dulwich.objects import (
31
32
        Commit,
63
64
        # do not provide a BranchDataConfig
64
65
        self.option_sources = self.option_sources[0], self.option_sources[2]
65
66
 
66
 
    def set_user_option(self, name, value, local=False):
 
67
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
67
68
        """Force local to True"""
68
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
69
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
69
70
 
70
71
 
71
72
class GitBranchFormat(branch.BranchFormat):
90
91
        self.base = bzrdir.transport.base
91
92
        self._format = GitBranchFormat()
92
93
 
 
94
    def dpull(self, source, stop_revision=None):
 
95
        if stop_revision is None:
 
96
            stop_revision = source.last_revision()
 
97
        # FIXME: Check for diverged branches
 
98
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
99
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(revidmap[stop_revision])
 
100
        return revidmap
 
101
 
93
102
    def lock_write(self):
94
103
        self.control_files.lock_write()
95
104
 
123
132
            return revision.NULL_REVISION
124
133
        return self.mapping.revision_id_foreign_to_bzr(self.head)
125
134
 
 
135
    def create_checkout(self, to_location, revision_id=None, 
 
136
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
137
        if lightweight:
 
138
            raise LightWeightCheckoutsNotSupported()
 
139
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
140
 
 
141
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
142
                                     hardlink=False):
 
143
        """Create a new heavyweight checkout of this branch.
 
144
 
 
145
        :param to_location: URL of location to create the new checkout in.
 
146
        :param revision_id: Revision that should be the tip of the checkout.
 
147
        :param hardlink: Whether to hardlink
 
148
        :return: WorkingTree object of checkout.
 
149
        """
 
150
        checkout_branch = BzrDir.create_branch_convenience(
 
151
            to_location, force_new_tree=False, format=get_rich_root_format())
 
152
        checkout = checkout_branch.bzrdir
 
153
        checkout_branch.bind(self)
 
154
        # pull up to the specified revision_id to set the initial 
 
155
        # branch tip correctly, and seed it with history.
 
156
        checkout_branch.pull(self, stop_revision=revision_id)
 
157
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
 
158
 
126
159
    def _make_tags(self):
127
160
        return GitTagDict(self)
128
161
 
144
177
    def set_push_location(self, location):
145
178
        """See Branch.set_push_location."""
146
179
        self.get_config().set_user_option('push_location', location,
147
 
                                          local=True)
 
180
                                          store=config.STORE_LOCATION)
148
181
 
149
182
    def supports_tags(self):
150
183
        return True