/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

Remove tests for removed FetchGraphWalker.

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