/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

https://launchpad.net/bugs/323972
mention the requirement to install Dulwich.

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
26
27
 
27
28
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
from bzrlib.plugins.git.mapping import default_mapping
 
29
from bzrlib.plugins.git.errors import LightWeightCheckoutsNotSupported
 
30
 
 
31
from dulwich.objects import (
 
32
        Commit,
 
33
        Tag,
 
34
        )
29
35
 
30
36
class GitTagDict(tag.BasicTags):
31
37
 
35
41
 
36
42
    def get_tag_dict(self):
37
43
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
44
        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
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
53
        return ret
41
54
 
42
55
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
56
        self.repository._git.tags[name] = revid
44
57
 
45
58
 
46
59
class GitBranchConfig(config.BranchConfig):
51
64
        # do not provide a BranchDataConfig
52
65
        self.option_sources = self.option_sources[0], self.option_sources[2]
53
66
 
54
 
    def set_user_option(self, name, value, local=False):
 
67
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
55
68
        """Force local to True"""
56
 
        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)
57
70
 
58
71
 
59
72
class GitBranchFormat(branch.BranchFormat):
70
83
 
71
84
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
85
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
86
        super(GitBranch, self).__init__(repository.get_mapping())
74
87
        self.control_files = lockfiles
75
88
        self.bzrdir = bzrdir
76
89
        self.name = name
78
91
        self.base = bzrdir.transport.base
79
92
        self._format = GitBranchFormat()
80
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
 
81
102
    def lock_write(self):
82
103
        self.control_files.lock_write()
83
104
 
89
110
        """See Branch.get_parent()."""
90
111
        return None
91
112
 
 
113
    def set_parent(self, url):
 
114
        pass
 
115
 
92
116
    def lock_read(self):
93
117
        self.control_files.lock_read()
94
118
 
108
132
            return revision.NULL_REVISION
109
133
        return self.mapping.revision_id_foreign_to_bzr(self.head)
110
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
 
111
159
    def _make_tags(self):
112
160
        return GitTagDict(self)
113
161
 
129
177
    def set_push_location(self, location):
130
178
        """See Branch.set_push_location."""
131
179
        self.get_config().set_user_option('push_location', location,
132
 
                                          local=True)
 
180
                                          store=config.STORE_LOCATION)
133
181
 
134
182
    def supports_tags(self):
135
183
        return True