/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

Cope with API changes in Dulwich.

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
    errors,
 
29
    foreign,
 
30
    repository,
22
31
    revision,
23
32
    tag,
24
 
    )
25
 
from bzrlib.decorators import needs_read_lock
26
 
from bzrlib.trace import mutter
27
 
 
28
 
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
 
 
36
 
class GitTagDict(tag.BasicTags):
 
33
    transport,
 
34
    )
 
35
from bzrlib.decorators import (
 
36
    needs_read_lock,
 
37
    )
 
38
from bzrlib.trace import (
 
39
    is_quiet,
 
40
    mutter,
 
41
    )
 
42
 
 
43
from bzrlib.plugins.git.config import (
 
44
    GitBranchConfig,
 
45
    )
 
46
from bzrlib.plugins.git.errors import (
 
47
    NoPushSupport,
 
48
    NoSuchRef,
 
49
    )
 
50
 
 
51
try:
 
52
    from bzrlib.foreign import ForeignBranch
 
53
except ImportError:
 
54
    class ForeignBranch(branch.Branch):
 
55
        def __init__(self, mapping):
 
56
            self.mapping = mapping
 
57
            super(ForeignBranch, self).__init__()
 
58
 
 
59
 
 
60
def extract_tags(refs, mapping):
 
61
    ret = {}
 
62
    for k,v in refs.iteritems():
 
63
        if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
64
            v = refs.get(k+"^{}", v)
 
65
            ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
 
66
    return ret
 
67
 
 
68
 
 
69
class GitPullResult(branch.PullResult):
 
70
 
 
71
    def _lookup_revno(self, revid):
 
72
        assert isinstance(revid, str), "was %r" % revid
 
73
        # Try in source branch first, it'll be faster
 
74
        return self.target_branch.revision_id_to_revno(revid)
 
75
 
 
76
    @property
 
77
    def old_revno(self):
 
78
        return self._lookup_revno(self.old_revid)
 
79
 
 
80
    @property
 
81
    def new_revno(self):
 
82
        return self._lookup_revno(self.new_revid)
 
83
 
 
84
 
 
85
class LocalGitTagDict(tag.BasicTags):
 
86
    """Dictionary with tags in a local repository."""
37
87
 
38
88
    def __init__(self, branch):
39
89
        self.branch = branch
41
91
 
42
92
    def get_tag_dict(self):
43
93
        ret = {}
44
 
        for k,v in self.repository._git.tags.iteritems():
 
94
        for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():
45
95
            obj = self.repository._git.get_object(v)
46
96
            while isinstance(obj, Tag):
47
97
                v = obj.object[1]
48
98
                obj = self.repository._git.get_object(v)
49
99
            if not isinstance(obj, Commit):
50
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
100
                mutter("Tag %s points at object %r that is not a commit, "
 
101
                       "ignoring", k, obj)
51
102
                continue
52
103
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
53
104
        return ret
54
105
 
55
106
    def set_tag(self, name, revid):
56
 
        self.repository._git.tags[name] = revid
57
 
 
58
 
 
59
 
class GitBranchConfig(config.BranchConfig):
60
 
    """BranchConfig that uses locations.conf in place of branch.conf"""
61
 
 
62
 
    def __init__(self, branch):
63
 
        config.BranchConfig.__init__(self, branch)
64
 
        # do not provide a BranchDataConfig
65
 
        self.option_sources = self.option_sources[0], self.option_sources[2]
66
 
 
67
 
    def set_user_option(self, name, value, store=config.STORE_BRANCH, warn_masked=False):
68
 
        """Force local to True"""
69
 
        config.BranchConfig.set_user_option(self, name, value, store=config.STORE_LOCATION, warn_masked=warn_masked)
 
107
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
108
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
70
109
 
71
110
 
72
111
class GitBranchFormat(branch.BranchFormat):
77
116
    def supports_tags(self):
78
117
        return True
79
118
 
 
119
    def make_tags(self, branch):
 
120
        if getattr(branch.repository, "get_refs", None) is not None:
 
121
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
122
            return RemoteGitTagDict(branch)
 
123
        else:
 
124
            return LocalGitTagDict(branch)
 
125
 
80
126
 
81
127
class GitBranch(ForeignBranch):
82
128
    """An adapter to git repositories for bzr Branch objects."""
83
129
 
84
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
130
    def __init__(self, bzrdir, repository, name, lockfiles):
85
131
        self.repository = repository
86
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
132
        self._format = GitBranchFormat()
87
133
        self.control_files = lockfiles
88
134
        self.bzrdir = bzrdir
 
135
        super(GitBranch, self).__init__(repository.get_mapping())
89
136
        self.name = name
90
 
        self.head = head
 
137
        self._head = None
91
138
        self.base = bzrdir.transport.base
92
 
        self._format = GitBranchFormat()
 
139
 
 
140
    def _get_nick(self, local=False, possible_master_transports=None):
 
141
        """Find the nick name for this branch.
 
142
 
 
143
        :return: Branch nick
 
144
        """
 
145
        return self.name
 
146
 
 
147
    def _set_nick(self, nick):
 
148
        raise NotImplementedError
 
149
 
 
150
    nick = property(_get_nick, _set_nick)
 
151
 
 
152
    def __repr__(self):
 
153
        return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
93
154
 
94
155
    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
 
156
        return branch.InterBranch.get(source, self).lossy_push()
 
157
 
 
158
    def generate_revision_history(self, revid, old_revid=None):
 
159
        # FIXME: Check that old_revid is in the ancestry of revid
 
160
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
 
161
        self._set_head(newhead)
101
162
 
102
163
    def lock_write(self):
103
164
        self.control_files.lock_write()
108
169
 
109
170
    def get_parent(self):
110
171
        """See Branch.get_parent()."""
 
172
        # FIXME: Set "origin" url from .git/config ?
111
173
        return None
112
174
 
113
175
    def set_parent(self, url):
 
176
        # FIXME: Set "origin" url in .git/config ?
114
177
        pass
115
178
 
116
179
    def lock_read(self):
117
180
        self.control_files.lock_read()
118
181
 
 
182
    def is_locked(self):
 
183
        return self.control_files.is_locked()
 
184
 
119
185
    def unlock(self):
120
186
        self.control_files.unlock()
121
187
 
122
188
    def get_physical_lock_status(self):
123
189
        return False
124
190
 
125
 
 
126
 
class LocalGitBranch(GitBranch):
127
 
 
128
191
    @needs_read_lock
129
192
    def last_revision(self):
130
193
        # perhaps should escape this ?
132
195
            return revision.NULL_REVISION
133
196
        return self.mapping.revision_id_foreign_to_bzr(self.head)
134
197
 
135
 
    def create_checkout(self, to_location, revision_id=None, 
136
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
198
 
 
199
class LocalGitBranch(GitBranch):
 
200
    """A local Git branch."""
 
201
 
 
202
    def _get_checkout_format(self):
 
203
        """Return the most suitable metadir for a checkout of this branch.
 
204
        Weaves are used if this branch's repository uses weaves.
 
205
        """
 
206
        format = self.repository.bzrdir.checkout_metadir()
 
207
        format.set_branch_format(self._format)
 
208
        return format
 
209
 
 
210
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
211
        accelerator_tree=None, hardlink=False):
137
212
        if lightweight:
138
 
            raise LightWeightCheckoutsNotSupported()
139
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
213
            t = transport.get_transport(to_location)
 
214
            t.ensure_base()
 
215
            format = self._get_checkout_format()
 
216
            checkout = format.initialize_on_transport(t)
 
217
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
218
                self)
 
219
            tree = checkout.create_workingtree(revision_id,
 
220
                from_branch=from_branch, hardlink=hardlink)
 
221
            return tree
 
222
        else:
 
223
            return self._create_heavyweight_checkout(to_location, revision_id,
 
224
            hardlink)
140
225
 
141
226
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
142
227
                                     hardlink=False):
156
241
        checkout_branch.pull(self, stop_revision=revision_id)
157
242
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
158
243
 
159
 
    def _make_tags(self):
160
 
        return GitTagDict(self)
161
 
 
162
244
    def _gen_revision_history(self):
163
245
        if self.head is None:
164
246
            return []
165
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
247
        ret = list(self.repository.iter_reverse_revision_history(
 
248
            self.last_revision()))
166
249
        ret.reverse()
167
250
        return ret
168
251
 
 
252
    def _get_head(self):
 
253
        try:
 
254
            return self.repository._git.ref(self.name)
 
255
        except KeyError:
 
256
            return None
 
257
 
 
258
    def _set_head(self, value):
 
259
        self._head = value
 
260
        self.repository._git.refs[self.name] = self._head
 
261
        self._clear_cached_state()
 
262
 
 
263
    head = property(_get_head, _set_head)
 
264
 
169
265
    def get_config(self):
170
266
        return GitBranchConfig(self)
171
267
 
182
278
    def supports_tags(self):
183
279
        return True
184
280
 
185
 
    def sprout(self, to_bzrdir, revision_id=None):
186
 
        """See Branch.sprout()."""
187
 
        result = to_bzrdir.create_branch()
188
 
        self.copy_content_into(result, revision_id=revision_id)
189
 
        result.set_parent(self.bzrdir.root_transport.base)
190
 
        return result
191
 
 
 
281
 
 
282
class GitBranchPullResult(branch.PullResult):
 
283
 
 
284
    def report(self, to_file):
 
285
        if not is_quiet():
 
286
            if self.old_revid == self.new_revid:
 
287
                to_file.write('No revisions to pull.\n')
 
288
            else:
 
289
                to_file.write('Now on revision %d (git sha: %s).\n' % 
 
290
                        (self.new_revno, self.new_git_head))
 
291
        self._show_tag_conficts(to_file)
 
292
 
 
293
 
 
294
class InterFromGitBranch(branch.InterBranch):
 
295
    """InterBranch implementation that pulls from Git into bzr."""
 
296
 
 
297
    @classmethod
 
298
    def is_compatible(self, source, target):
 
299
        return (isinstance(source, GitBranch) and 
 
300
                not isinstance(target, GitBranch))
 
301
 
 
302
    def update_revisions(self, stop_revision=None, overwrite=False,
 
303
        graph=None):
 
304
        """See InterBranch.update_revisions()."""
 
305
        interrepo = repository.InterRepository.get(self.source.repository, 
 
306
            self.target.repository)
 
307
        self._head = None
 
308
        self._last_revid = None
 
309
        def determine_wants(heads):
 
310
            if not self.source.name in heads:
 
311
                raise NoSuchRef(self.source.name, heads.keys())
 
312
            if stop_revision is not None:
 
313
                self._last_revid = stop_revision
 
314
                self._head, mapping = self.source.repository.lookup_git_revid(
 
315
                    stop_revision)
 
316
            else:
 
317
                self._head = heads[self.source.name]
 
318
                self._last_revid = \
 
319
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
 
320
            if self.target.repository.has_revision(self._last_revid):
 
321
                return []
 
322
            return [self._head]
 
323
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
324
        if overwrite:
 
325
            prev_last_revid = None
 
326
        else:
 
327
            prev_last_revid = self.target.last_revision()
 
328
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
329
 
 
330
    def pull(self, overwrite=False, stop_revision=None,
 
331
             possible_transports=None, _hook_master=None, run_hooks=True,
 
332
             _override_hook_target=None, local=False):
 
333
        """See Branch.pull.
 
334
 
 
335
        :param _hook_master: Private parameter - set the branch to
 
336
            be supplied as the master to pull hooks.
 
337
        :param run_hooks: Private parameter - if false, this branch
 
338
            is being called because it's the master of the primary branch,
 
339
            so it should not run its hooks.
 
340
        :param _override_hook_target: Private parameter - set the branch to be
 
341
            supplied as the target_branch to pull hooks.
 
342
        """
 
343
        # This type of branch can't be bound.
 
344
        if local:
 
345
            raise errors.LocalRequiresBoundBranch()
 
346
        result = GitBranchPullResult()
 
347
        result.source_branch = self.source
 
348
        if _override_hook_target is None:
 
349
            result.target_branch = self.target
 
350
        else:
 
351
            result.target_branch = _override_hook_target
 
352
        self.source.lock_read()
 
353
        try:
 
354
            # We assume that during 'pull' the target repository is closer than
 
355
            # the source one.
 
356
            graph = self.target.repository.get_graph(self.source.repository)
 
357
            result.old_revno, result.old_revid = \
 
358
                self.target.last_revision_info()
 
359
            self.update_revisions(stop_revision, overwrite=overwrite, 
 
360
                graph=graph)
 
361
            result.new_git_head = self._head
 
362
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
363
                overwrite)
 
364
            result.new_revno, result.new_revid = self.target.last_revision_info()
 
365
            if _hook_master:
 
366
                result.master_branch = _hook_master
 
367
                result.local_branch = result.target_branch
 
368
            else:
 
369
                result.master_branch = result.target_branch
 
370
                result.local_branch = None
 
371
            if run_hooks:
 
372
                for hook in branch.Branch.hooks['post_pull']:
 
373
                    hook(result)
 
374
        finally:
 
375
            self.source.unlock()
 
376
        return result
 
377
 
 
378
 
 
379
class InterGitRemoteLocalBranch(branch.InterBranch):
 
380
    """InterBranch implementation that pulls between Git branches."""
 
381
 
 
382
    @classmethod
 
383
    def is_compatible(self, source, target):
 
384
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
385
        return (isinstance(source, RemoteGitBranch) and 
 
386
                isinstance(target, LocalGitBranch))
 
387
 
 
388
    def pull(self, stop_revision=None, overwrite=False, 
 
389
        possible_transports=None, local=False):
 
390
        # This type of branch can't be bound.
 
391
        if local:
 
392
            raise errors.LocalRequiresBoundBranch()
 
393
        result = GitPullResult()
 
394
        result.source_branch = self.source
 
395
        result.target_branch = self.target
 
396
        interrepo = repository.InterRepository.get(self.source.repository, 
 
397
            self.target.repository)
 
398
        result.old_revid = self.target.last_revision()
 
399
        if stop_revision is None:
 
400
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
401
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
402
        else:
 
403
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
404
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
405
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
 
406
            self.target.tags.set_tag(name, revid)
 
407
        result.new_revid = self.target.last_revision()
 
408
        return result
 
409
 
 
410
    
 
411
class InterToGitBranch(branch.InterBranch):
 
412
    """InterBranch implementation that pulls from Git into bzr."""
 
413
 
 
414
    @classmethod
 
415
    def is_compatible(self, source, target):
 
416
        return (not isinstance(source, GitBranch) and 
 
417
                isinstance(target, GitBranch))
 
418
 
 
419
    def push(self, overwrite=True, stop_revision=None, 
 
420
             _override_hook_source_branch=None):
 
421
        raise NoPushSupport()
 
422
 
 
423
    def lossy_push(self, stop_revision=None):
 
424
        if stop_revision is None:
 
425
            stop_revision = self.source.last_revision()
 
426
        # FIXME: Check for diverged branches
 
427
        refs = { "refs/heads/master": stop_revision }
 
428
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
429
            if self.source.repository.has_revision(revid):
 
430
                refs["refs/tags/%s" % name] = revid
 
431
        revidmap, new_refs = self.target.repository.dfetch_refs(
 
432
            self.source.repository, refs)
 
433
        if revidmap != {}:
 
434
            self.target.generate_revision_history(revidmap[stop_revision])
 
435
        return revidmap
 
436
 
 
437
 
 
438
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
 
439
branch.InterBranch.register_optimiser(InterFromGitBranch)
 
440
branch.InterBranch.register_optimiser(InterToGitBranch)