/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

Reoncile InterGitRepository objects.

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