/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

Support short git revision specifiers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
1
1
# Copyright (C) 2007 Canonical Ltd
 
2
# Copyright (C) 2009 Jelmer Vernooij <jelmer@samba.org>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
16
17
 
17
18
"""An adapter between a Git Branch and a Bazaar Branch"""
18
19
 
 
20
from dulwich.objects import (
 
21
    Commit,
 
22
    Tag,
 
23
    )
 
24
 
19
25
from bzrlib import (
20
26
    branch,
21
27
    config,
 
28
    repository,
22
29
    revision,
23
30
    tag,
24
 
    )
25
 
from bzrlib.decorators import needs_read_lock
26
 
 
27
 
from bzrlib.plugins.git.foreign import ForeignBranch
28
 
from bzrlib.plugins.git.mapping import default_mapping
29
 
 
30
 
class GitTagDict(tag.BasicTags):
 
31
    transport,
 
32
    )
 
33
from bzrlib.decorators import (
 
34
    needs_read_lock,
 
35
    )
 
36
from bzrlib.trace import (
 
37
    mutter,
 
38
    )
 
39
 
 
40
from bzrlib.plugins.git.errors import (
 
41
    NoSuchRef,
 
42
    )
 
43
from bzrlib.plugins.git.foreign import (
 
44
    ForeignBranch,
 
45
    )
 
46
 
 
47
 
 
48
class LocalGitTagDict(tag.BasicTags):
 
49
    """Dictionary with tags in a local repository."""
31
50
 
32
51
    def __init__(self, branch):
33
52
        self.branch = branch
35
54
 
36
55
    def get_tag_dict(self):
37
56
        ret = {}
38
 
        for tag in self.repository._git.tags:
39
 
            ret[tag.name] = self.branch.mapping.revision_id_foreign_to_bzr(tag.ref)
 
57
        for k,v in self.repository._git.tags.iteritems():
 
58
            obj = self.repository._git.get_object(v)
 
59
            while isinstance(obj, Tag):
 
60
                v = obj.object[1]
 
61
                obj = self.repository._git.get_object(v)
 
62
            if not isinstance(obj, Commit):
 
63
                mutter("Tag %s points at object %r that is not a commit, "
 
64
                       "ignoring", k, obj)
 
65
                continue
 
66
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
40
67
        return ret
41
68
 
42
69
    def set_tag(self, name, revid):
43
 
        raise NotImplementedError(self.set_tag)
 
70
        self.repository._git.tags[name] = revid
44
71
 
45
72
 
46
73
class GitBranchConfig(config.BranchConfig):
51
78
        # do not provide a BranchDataConfig
52
79
        self.option_sources = self.option_sources[0], self.option_sources[2]
53
80
 
54
 
    def set_user_option(self, name, value, local=False):
 
81
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
 
82
            warn_masked=False):
55
83
        """Force local to True"""
56
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
84
        config.BranchConfig.set_user_option(self, name, value,
 
85
            store=config.STORE_LOCATION, warn_masked=warn_masked)
57
86
 
58
87
 
59
88
class GitBranchFormat(branch.BranchFormat):
64
93
    def supports_tags(self):
65
94
        return True
66
95
 
 
96
    def make_tags(self, branch):
 
97
        if getattr(branch.repository, "get_refs", None) is not None:
 
98
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
99
            return RemoteGitTagDict(branch)
 
100
        else:
 
101
            return LocalGitTagDict(branch)
 
102
 
67
103
 
68
104
class GitBranch(ForeignBranch):
69
105
    """An adapter to git repositories for bzr Branch objects."""
70
106
 
71
107
    def __init__(self, bzrdir, repository, name, head, lockfiles):
72
108
        self.repository = repository
73
 
        super(GitBranch, self).__init__(default_mapping)
 
109
        self._format = GitBranchFormat()
 
110
        super(GitBranch, self).__init__(repository.get_mapping())
74
111
        self.control_files = lockfiles
75
112
        self.bzrdir = bzrdir
76
113
        self.name = name
77
114
        self.head = head
78
115
        self.base = bzrdir.transport.base
79
 
        self._format = GitBranchFormat()
 
116
 
 
117
    def _get_nick(self, local=False, possible_master_transports=None):
 
118
        """Find the nick name for this branch.
 
119
 
 
120
        :return: Branch nick
 
121
        """
 
122
        return self.name
 
123
 
 
124
    nick = property(_get_nick)
 
125
 
 
126
    def dpull(self, source, stop_revision=None):
 
127
        if stop_revision is None:
 
128
            stop_revision = source.last_revision()
 
129
        # FIXME: Check for diverged branches
 
130
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
131
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
 
132
            revidmap[stop_revision])
 
133
        self.repository._git.set_ref(self.name, self.head)
 
134
        return revidmap
80
135
 
81
136
    def lock_write(self):
82
137
        self.control_files.lock_write()
87
142
 
88
143
    def get_parent(self):
89
144
        """See Branch.get_parent()."""
 
145
        # FIXME: Set "origin" url from .git/config ?
90
146
        return None
91
147
 
 
148
    def set_parent(self, url):
 
149
        # FIXME: Set "origin" url in .git/config ?
 
150
        pass
 
151
 
92
152
    def lock_read(self):
93
153
        self.control_files.lock_read()
94
154
 
100
160
 
101
161
 
102
162
class LocalGitBranch(GitBranch):
 
163
    """A local Git branch."""
103
164
 
104
165
    @needs_read_lock
105
166
    def last_revision(self):
108
169
            return revision.NULL_REVISION
109
170
        return self.mapping.revision_id_foreign_to_bzr(self.head)
110
171
 
111
 
    def _make_tags(self):
112
 
        return GitTagDict(self)
 
172
    def _get_checkout_format(self):
 
173
        """Return the most suitable metadir for a checkout of this branch.
 
174
        Weaves are used if this branch's repository uses weaves.
 
175
        """
 
176
        format = self.repository.bzrdir.checkout_metadir()
 
177
        format.set_branch_format(self._format)
 
178
        return format
 
179
 
 
180
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
181
        accelerator_tree=None, hardlink=False):
 
182
        if lightweight:
 
183
            t = transport.get_transport(to_location)
 
184
            t.ensure_base()
 
185
            format = self._get_checkout_format()
 
186
            checkout = format.initialize_on_transport(t)
 
187
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
188
                self)
 
189
            tree = checkout.create_workingtree(revision_id,
 
190
                from_branch=from_branch, hardlink=hardlink)
 
191
            return tree
 
192
        else:
 
193
            return self._create_heavyweight_checkout(to_location, revision_id,
 
194
            hardlink)
 
195
 
 
196
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
197
                                     hardlink=False):
 
198
        """Create a new heavyweight checkout of this branch.
 
199
 
 
200
        :param to_location: URL of location to create the new checkout in.
 
201
        :param revision_id: Revision that should be the tip of the checkout.
 
202
        :param hardlink: Whether to hardlink
 
203
        :return: WorkingTree object of checkout.
 
204
        """
 
205
        checkout_branch = BzrDir.create_branch_convenience(
 
206
            to_location, force_new_tree=False, format=get_rich_root_format())
 
207
        checkout = checkout_branch.bzrdir
 
208
        checkout_branch.bind(self)
 
209
        # pull up to the specified revision_id to set the initial 
 
210
        # branch tip correctly, and seed it with history.
 
211
        checkout_branch.pull(self, stop_revision=revision_id)
 
212
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
113
213
 
114
214
    def _gen_revision_history(self):
115
215
        if self.head is None:
116
216
            return []
117
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
217
        ret = list(self.repository.iter_reverse_revision_history(
 
218
            self.last_revision()))
118
219
        ret.reverse()
119
220
        return ret
120
221
 
129
230
    def set_push_location(self, location):
130
231
        """See Branch.set_push_location."""
131
232
        self.get_config().set_user_option('push_location', location,
132
 
                                          local=True)
 
233
                                          store=config.STORE_LOCATION)
133
234
 
134
235
    def supports_tags(self):
135
236
        return True
136
237
 
137
 
    def sprout(self, to_bzrdir, revision_id=None):
138
 
        """See Branch.sprout()."""
139
 
        result = to_bzrdir.create_branch()
140
 
        self.copy_content_into(result, revision_id=revision_id)
141
 
        result.set_parent(self.bzrdir.root_transport.base)
142
 
        return result
143
 
 
 
238
 
 
239
class InterGitGenericBranch(branch.InterBranch):
 
240
    """InterBranch implementation that pulls from Git into bzr."""
 
241
 
 
242
    @classmethod
 
243
    def is_compatible(self, source, target):
 
244
        return isinstance(source, GitBranch)
 
245
 
 
246
    def update_revisions(self, stop_revision=None, overwrite=False,
 
247
        graph=None):
 
248
        """See InterBranch.update_revisions()."""
 
249
        interrepo = repository.InterRepository.get(self.source.repository, 
 
250
            self.target.repository)
 
251
        self._last_revid = None
 
252
        def determine_wants(heads):
 
253
            if not self.source.name in heads:
 
254
                raise NoSuchRef(self.source.name, heads.keys())
 
255
            if stop_revision is not None:
 
256
                self._last_revid = stop_revision
 
257
                head, mapping = self.source.repository.lookup_git_revid(
 
258
                    stop_revision)
 
259
            else:
 
260
                head = heads[self.source.name]
 
261
                self._last_revid = \
 
262
                    self.source.mapping.revision_id_foreign_to_bzr(head)
 
263
            if self.target.repository.has_revision(self._last_revid):
 
264
                return []
 
265
            return [head]
 
266
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
267
        if overwrite:
 
268
            prev_last_revid = None
 
269
        else:
 
270
            prev_last_revid = self.target.last_revision()
 
271
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
272
 
 
273
 
 
274
branch.InterBranch.register_optimiser(InterGitGenericBranch)