/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

Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
23
23
    tag,
24
24
    )
25
25
from bzrlib.decorators import needs_read_lock
26
 
from bzrlib.trace import mutter
27
26
 
28
27
from bzrlib.plugins.git.foreign import ForeignBranch
29
 
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
30
 
 
31
 
from dulwich.objects import (
32
 
        Commit,
33
 
        Tag,
34
 
        )
35
28
 
36
29
class GitTagDict(tag.BasicTags):
37
30
 
42
35
    def get_tag_dict(self):
43
36
        ret = {}
44
37
        for k,v in self.repository._git.tags.iteritems():
45
 
            obj = self.repository._git.get_object(v)
46
 
            while isinstance(obj, Tag):
47
 
                v = obj.object[1]
48
 
                obj = self.repository._git.get_object(v)
49
 
            if not isinstance(obj, Commit):
50
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
51
 
                continue
52
38
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
53
39
        return ret
54
40
 
64
50
        # do not provide a BranchDataConfig
65
51
        self.option_sources = self.option_sources[0], self.option_sources[2]
66
52
 
67
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
 
53
    def set_user_option(self, name, value, local=False):
68
54
        """Force local to True"""
69
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
55
        config.BranchConfig.set_user_option(self, name, value, local=True)
70
56
 
71
57
 
72
58
class GitBranchFormat(branch.BranchFormat):
91
77
        self.base = bzrdir.transport.base
92
78
        self._format = GitBranchFormat()
93
79
 
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
 
 
102
80
    def lock_write(self):
103
81
        self.control_files.lock_write()
104
82
 
132
110
            return revision.NULL_REVISION
133
111
        return self.mapping.revision_id_foreign_to_bzr(self.head)
134
112
 
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
 
 
159
113
    def _make_tags(self):
160
114
        return GitTagDict(self)
161
115
 
177
131
    def set_push_location(self, location):
178
132
        """See Branch.set_push_location."""
179
133
        self.get_config().set_user_option('push_location', location,
180
 
                                          store=config.STORE_LOCATION)
 
134
                                          local=True)
181
135
 
182
136
    def supports_tags(self):
183
137
        return True