/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

Fix index creation when fetching from remote host.

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
 
    )
24
 
from bzrlib.decorators import needs_read_lock
25
 
 
26
 
from bzrlib.plugins.git import ids
 
30
    tag,
 
31
    )
 
32
from bzrlib.decorators import (
 
33
    needs_read_lock,
 
34
    )
 
35
from bzrlib.trace import (
 
36
    mutter,
 
37
    )
 
38
 
 
39
from bzrlib.plugins.git.errors import (
 
40
    NoSuchRef,
 
41
    )
 
42
from bzrlib.plugins.git.foreign import (
 
43
    ForeignBranch,
 
44
    )
 
45
from bzrlib.plugins.git.errors import (
 
46
    LightWeightCheckoutsNotSupported,
 
47
    )
 
48
 
 
49
 
 
50
class LocalGitTagDict(tag.BasicTags):
 
51
    """Dictionary with tags in a local repository."""
 
52
 
 
53
    def __init__(self, branch):
 
54
        self.branch = branch
 
55
        self.repository = branch.repository
 
56
 
 
57
    def get_tag_dict(self):
 
58
        ret = {}
 
59
        for k,v in self.repository._git.tags.iteritems():
 
60
            obj = self.repository._git.get_object(v)
 
61
            while isinstance(obj, Tag):
 
62
                v = obj.object[1]
 
63
                obj = self.repository._git.get_object(v)
 
64
            if not isinstance(obj, Commit):
 
65
                mutter("Tag %s points at object %r that is not a commit, "
 
66
                       "ignoring", k, obj)
 
67
                continue
 
68
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
 
69
        return ret
 
70
 
 
71
    def set_tag(self, name, revid):
 
72
        self.repository._git.tags[name] = revid
27
73
 
28
74
 
29
75
class GitBranchConfig(config.BranchConfig):
34
80
        # do not provide a BranchDataConfig
35
81
        self.option_sources = self.option_sources[0], self.option_sources[2]
36
82
 
37
 
    def set_user_option(self, name, value, local=False):
 
83
    def set_user_option(self, name, value, store=config.STORE_BRANCH,
 
84
            warn_masked=False):
38
85
        """Force local to True"""
39
 
        config.BranchConfig.set_user_option(self, name, value, local=True)
 
86
        config.BranchConfig.set_user_option(self, name, value,
 
87
            store=config.STORE_LOCATION, warn_masked=warn_masked)
40
88
 
41
89
 
42
90
class GitBranchFormat(branch.BranchFormat):
44
92
    def get_format_description(self):
45
93
        return 'Git Branch'
46
94
 
47
 
 
48
 
class GitBranch(branch.Branch):
 
95
    def supports_tags(self):
 
96
        return True
 
97
 
 
98
    def make_tags(self, branch):
 
99
        if getattr(branch.repository, "get_refs", None) is not None:
 
100
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
101
            return RemoteGitTagDict(branch)
 
102
        else:
 
103
            return LocalGitTagDict(branch)
 
104
 
 
105
 
 
106
class GitBranch(ForeignBranch):
49
107
    """An adapter to git repositories for bzr Branch objects."""
50
108
 
51
 
    def __init__(self, bzrdir, repository, head, base, lockfiles):
52
 
        super(GitBranch, self).__init__()
 
109
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
110
        self.repository = repository
 
111
        self._format = GitBranchFormat()
 
112
        super(GitBranch, self).__init__(repository.get_mapping())
53
113
        self.control_files = lockfiles
54
114
        self.bzrdir = bzrdir
55
 
        self.repository = repository
 
115
        self.name = name
56
116
        self.head = head
57
 
        self.base = base
58
 
        self._format = GitBranchFormat()
 
117
        self.base = bzrdir.transport.base
 
118
 
 
119
    def _get_nick(self, local=False, possible_master_transports=None):
 
120
        """Find the nick name for this branch.
 
121
 
 
122
        :return: Branch nick
 
123
        """
 
124
        return self.name
 
125
 
 
126
    nick = property(_get_nick)
 
127
 
 
128
    def dpull(self, source, stop_revision=None):
 
129
        if stop_revision is None:
 
130
            stop_revision = source.last_revision()
 
131
        # FIXME: Check for diverged branches
 
132
        revidmap = self.repository.dfetch(source.repository, stop_revision)
 
133
        self.head, self.mapping = self.mapping.revision_id_bzr_to_foreign(
 
134
            revidmap[stop_revision])
 
135
        self.repository._git.set_ref(self.name, self.head)
 
136
        return revidmap
59
137
 
60
138
    def lock_write(self):
61
139
        self.control_files.lock_write()
62
140
 
 
141
    def get_stacked_on_url(self):
 
142
        # Git doesn't do stacking (yet...)
 
143
        return None
 
144
 
 
145
    def get_parent(self):
 
146
        """See Branch.get_parent()."""
 
147
        return None
 
148
 
 
149
    def set_parent(self, url):
 
150
        pass
 
151
 
 
152
    def lock_read(self):
 
153
        self.control_files.lock_read()
 
154
 
 
155
    def unlock(self):
 
156
        self.control_files.unlock()
 
157
 
 
158
    def get_physical_lock_status(self):
 
159
        return False
 
160
 
 
161
 
 
162
class LocalGitBranch(GitBranch):
 
163
    """A local Git branch."""
 
164
 
63
165
    @needs_read_lock
64
166
    def last_revision(self):
65
167
        # perhaps should escape this ?
66
168
        if self.head is None:
67
169
            return revision.NULL_REVISION
68
 
        return ids.convert_revision_id_git_to_bzr(self.head)
69
 
 
70
 
    def get_parent(self):
71
 
        """See Branch.get_parent()."""
72
 
        return None
73
 
 
74
 
    def get_stacked_on_url(self):
75
 
        return None
 
170
        return self.mapping.revision_id_foreign_to_bzr(self.head)
 
171
 
 
172
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
173
        accelerator_tree=None, hardlink=False):
 
174
        if lightweight:
 
175
            raise LightWeightCheckoutsNotSupported()
 
176
        return self._create_heavyweight_checkout(to_location, revision_id,
 
177
            hardlink)
 
178
 
 
179
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
 
180
                                     hardlink=False):
 
181
        """Create a new heavyweight checkout of this branch.
 
182
 
 
183
        :param to_location: URL of location to create the new checkout in.
 
184
        :param revision_id: Revision that should be the tip of the checkout.
 
185
        :param hardlink: Whether to hardlink
 
186
        :return: WorkingTree object of checkout.
 
187
        """
 
188
        checkout_branch = BzrDir.create_branch_convenience(
 
189
            to_location, force_new_tree=False, format=get_rich_root_format())
 
190
        checkout = checkout_branch.bzrdir
 
191
        checkout_branch.bind(self)
 
192
        # pull up to the specified revision_id to set the initial 
 
193
        # branch tip correctly, and seed it with history.
 
194
        checkout_branch.pull(self, stop_revision=revision_id)
 
195
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
76
196
 
77
197
    def _gen_revision_history(self):
78
198
        if self.head is None:
79
199
            return []
80
 
        skip = 0
81
 
        cms = None
82
 
        ret = []
83
 
        max_count = 1000
84
 
        nextid = self.head
85
 
        while cms != []:
86
 
            cms = self.repository._git.commits(self.head, max_count=max_count, skip=skip)
87
 
            skip += max_count
88
 
            for cm in cms:
89
 
                if cm.id == nextid:
90
 
                    ret.append(ids.convert_revision_id_git_to_bzr(cm.id))
91
 
                    if cm.parents == []:
92
 
                        nextid = None
93
 
                    else:
94
 
                        nextid = cm.parents[0].id
 
200
        ret = list(self.repository.iter_reverse_revision_history(
 
201
            self.last_revision()))
95
202
        ret.reverse()
96
203
        return ret
97
204
 
98
205
    def get_config(self):
99
206
        return GitBranchConfig(self)
100
207
 
101
 
    def lock_read(self):
102
 
        self.control_files.lock_read()
103
 
 
104
 
    def unlock(self):
105
 
        self.control_files.unlock()
106
 
 
107
 
    def get_physical_lock_status(self):
108
 
        return False
109
 
 
110
208
    def get_push_location(self):
111
209
        """See Branch.get_push_location."""
112
210
        push_loc = self.get_config().get_user_option('push_location')
115
213
    def set_push_location(self, location):
116
214
        """See Branch.set_push_location."""
117
215
        self.get_config().set_user_option('push_location', location,
118
 
                                          local=True)
 
216
                                          store=config.STORE_LOCATION)
119
217
 
120
218
    def supports_tags(self):
121
 
        return False
 
219
        return True
 
220
 
 
221
 
 
222
class InterGitGenericBranch(branch.InterBranch):
 
223
    """InterBranch implementation that pulls from Git into bzr."""
 
224
 
 
225
    @classmethod
 
226
    def is_compatible(self, source, target):
 
227
        return isinstance(source, GitBranch)
 
228
 
 
229
    def update_revisions(self, stop_revision=None, overwrite=False,
 
230
        graph=None):
 
231
        """See InterBranch.update_revisions()."""
 
232
        # TODO: stop_revision, overwrite
 
233
        interrepo = repository.InterRepository.get(self.source.repository, 
 
234
            self.target.repository)
 
235
        self._last_revid = None
 
236
        def determine_wants(heads):
 
237
            if not self.source.name in heads:
 
238
                raise NoSuchRef(self.source.name, heads.keys())
 
239
            head = heads[self.source.name]
 
240
            self._last_revid = self.source.mapping.revision_id_foreign_to_bzr(
 
241
                head)
 
242
            if self.target.repository.has_revision(self._last_revid):
 
243
                return []
 
244
            return [head]
 
245
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
246
        # FIXME: Check that self._last_revid is a descendant of self.target.last_revision()
 
247
        self.target.generate_revision_history(self._last_revid)
 
248
 
 
249
 
 
250
branch.InterBranch.register_optimiser(InterGitGenericBranch)