/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 path argument to get_file_text.

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,
 
27
    bzrdir,
21
28
    config,
 
29
    errors,
 
30
    foreign,
 
31
    repository,
22
32
    revision,
23
33
    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):
 
34
    transport,
 
35
    )
 
36
from bzrlib.decorators import (
 
37
    needs_read_lock,
 
38
    )
 
39
from bzrlib.trace import (
 
40
    is_quiet,
 
41
    mutter,
 
42
    )
 
43
 
 
44
from bzrlib.plugins.git import (
 
45
    get_rich_root_format,
 
46
    )
 
47
from bzrlib.plugins.git.config import (
 
48
    GitBranchConfig,
 
49
    )
 
50
from bzrlib.plugins.git.errors import (
 
51
    NoPushSupport,
 
52
    NoSuchRef,
 
53
    )
 
54
 
 
55
try:
 
56
    from bzrlib.foreign import ForeignBranch
 
57
except ImportError:
 
58
    class ForeignBranch(branch.Branch):
 
59
        def __init__(self, mapping):
 
60
            self.mapping = mapping
 
61
            super(ForeignBranch, self).__init__()
 
62
 
 
63
 
 
64
def extract_tags(refs, mapping):
 
65
    ret = {}
 
66
    for k,v in refs.iteritems():
 
67
        if k.startswith("refs/tags/") and not k.endswith("^{}"):
 
68
            v = refs.get(k+"^{}", v)
 
69
            ret[k[len("refs/tags/"):]] = mapping.revision_id_foreign_to_bzr(v)
 
70
    return ret
 
71
 
 
72
 
 
73
class GitPullResult(branch.PullResult):
 
74
 
 
75
    def _lookup_revno(self, revid):
 
76
        assert isinstance(revid, str), "was %r" % revid
 
77
        # Try in source branch first, it'll be faster
 
78
        return self.target_branch.revision_id_to_revno(revid)
 
79
 
 
80
    @property
 
81
    def old_revno(self):
 
82
        return self._lookup_revno(self.old_revid)
 
83
 
 
84
    @property
 
85
    def new_revno(self):
 
86
        return self._lookup_revno(self.new_revid)
 
87
 
 
88
 
 
89
class LocalGitTagDict(tag.BasicTags):
 
90
    """Dictionary with tags in a local repository."""
37
91
 
38
92
    def __init__(self, branch):
39
93
        self.branch = branch
41
95
 
42
96
    def get_tag_dict(self):
43
97
        ret = {}
44
 
        for k,v in self.repository._git.tags.iteritems():
 
98
        for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():
45
99
            obj = self.repository._git.get_object(v)
46
100
            while isinstance(obj, Tag):
47
101
                v = obj.object[1]
48
102
                obj = self.repository._git.get_object(v)
49
103
            if not isinstance(obj, Commit):
50
 
                mutter("Tag %s points at object %r that is not a commit, ignoring", k, obj)
 
104
                mutter("Tag %s points at object %r that is not a commit, "
 
105
                       "ignoring", k, obj)
51
106
                continue
52
107
            ret[k] = self.branch.mapping.revision_id_foreign_to_bzr(v)
53
108
        return ret
54
109
 
55
110
    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)
 
111
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
112
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
70
113
 
71
114
 
72
115
class GitBranchFormat(branch.BranchFormat):
77
120
    def supports_tags(self):
78
121
        return True
79
122
 
 
123
    def make_tags(self, branch):
 
124
        if getattr(branch.repository, "get_refs", None) is not None:
 
125
            from bzrlib.plugins.git.remote import RemoteGitTagDict
 
126
            return RemoteGitTagDict(branch)
 
127
        else:
 
128
            return LocalGitTagDict(branch)
 
129
 
80
130
 
81
131
class GitBranch(ForeignBranch):
82
132
    """An adapter to git repositories for bzr Branch objects."""
83
133
 
84
 
    def __init__(self, bzrdir, repository, name, head, lockfiles):
 
134
    def __init__(self, bzrdir, repository, name, lockfiles):
85
135
        self.repository = repository
86
 
        super(GitBranch, self).__init__(repository.get_mapping())
 
136
        self._format = GitBranchFormat()
87
137
        self.control_files = lockfiles
88
138
        self.bzrdir = bzrdir
 
139
        super(GitBranch, self).__init__(repository.get_mapping())
89
140
        self.name = name
90
 
        self.head = head
 
141
        self._head = None
91
142
        self.base = bzrdir.transport.base
92
 
        self._format = GitBranchFormat()
93
 
 
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
 
143
 
 
144
    def _get_nick(self, local=False, possible_master_transports=None):
 
145
        """Find the nick name for this branch.
 
146
 
 
147
        :return: Branch nick
 
148
        """
 
149
        return self.name
 
150
 
 
151
    def _set_nick(self, nick):
 
152
        raise NotImplementedError
 
153
 
 
154
    nick = property(_get_nick, _set_nick)
 
155
 
 
156
    def __repr__(self):
 
157
        return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
 
158
 
 
159
    def generate_revision_history(self, revid, old_revid=None):
 
160
        # FIXME: Check that old_revid is in the ancestry of revid
 
161
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
 
162
        self._set_head(newhead)
101
163
 
102
164
    def lock_write(self):
103
165
        self.control_files.lock_write()
108
170
 
109
171
    def get_parent(self):
110
172
        """See Branch.get_parent()."""
 
173
        # FIXME: Set "origin" url from .git/config ?
111
174
        return None
112
175
 
113
176
    def set_parent(self, url):
 
177
        # FIXME: Set "origin" url in .git/config ?
114
178
        pass
115
179
 
116
180
    def lock_read(self):
117
181
        self.control_files.lock_read()
118
182
 
 
183
    def is_locked(self):
 
184
        return self.control_files.is_locked()
 
185
 
119
186
    def unlock(self):
120
187
        self.control_files.unlock()
121
188
 
122
189
    def get_physical_lock_status(self):
123
190
        return False
124
191
 
125
 
 
126
 
class LocalGitBranch(GitBranch):
127
 
 
128
192
    @needs_read_lock
129
193
    def last_revision(self):
130
194
        # perhaps should escape this ?
132
196
            return revision.NULL_REVISION
133
197
        return self.mapping.revision_id_foreign_to_bzr(self.head)
134
198
 
135
 
    def create_checkout(self, to_location, revision_id=None, 
136
 
                        lightweight=False, accelerator_tree=None, hardlink=False):
 
199
    def _basic_push(self, target, overwrite=False, stop_revision=None):
 
200
        return branch.InterBranch.get(self, target)._basic_push(
 
201
            overwrite, stop_revision)
 
202
 
 
203
 
 
204
class LocalGitBranch(GitBranch):
 
205
    """A local Git branch."""
 
206
 
 
207
    def _get_checkout_format(self):
 
208
        """Return the most suitable metadir for a checkout of this branch.
 
209
        Weaves are used if this branch's repository uses weaves.
 
210
        """
 
211
        format = self.repository.bzrdir.checkout_metadir()
 
212
        format.set_branch_format(self._format)
 
213
        return format
 
214
 
 
215
    def create_checkout(self, to_location, revision_id=None, lightweight=False,
 
216
        accelerator_tree=None, hardlink=False):
137
217
        if lightweight:
138
 
            raise LightWeightCheckoutsNotSupported()
139
 
        return self._create_heavyweight_checkout(to_location, revision_id, hardlink)
 
218
            t = transport.get_transport(to_location)
 
219
            t.ensure_base()
 
220
            format = self._get_checkout_format()
 
221
            checkout = format.initialize_on_transport(t)
 
222
            from_branch = branch.BranchReferenceFormat().initialize(checkout, 
 
223
                self)
 
224
            tree = checkout.create_workingtree(revision_id,
 
225
                from_branch=from_branch, hardlink=hardlink)
 
226
            return tree
 
227
        else:
 
228
            return self._create_heavyweight_checkout(to_location, revision_id,
 
229
            hardlink)
140
230
 
141
231
    def _create_heavyweight_checkout(self, to_location, revision_id=None, 
142
232
                                     hardlink=False):
147
237
        :param hardlink: Whether to hardlink
148
238
        :return: WorkingTree object of checkout.
149
239
        """
150
 
        checkout_branch = BzrDir.create_branch_convenience(
 
240
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
151
241
            to_location, force_new_tree=False, format=get_rich_root_format())
152
242
        checkout = checkout_branch.bzrdir
153
243
        checkout_branch.bind(self)
156
246
        checkout_branch.pull(self, stop_revision=revision_id)
157
247
        return checkout.create_workingtree(revision_id, hardlink=hardlink)
158
248
 
159
 
    def _make_tags(self):
160
 
        return GitTagDict(self)
161
 
 
162
249
    def _gen_revision_history(self):
163
250
        if self.head is None:
164
251
            return []
165
 
        ret = list(self.repository.iter_reverse_revision_history(self.last_revision()))
 
252
        ret = list(self.repository.iter_reverse_revision_history(
 
253
            self.last_revision()))
166
254
        ret.reverse()
167
255
        return ret
168
256
 
 
257
    def _get_head(self):
 
258
        try:
 
259
            return self.repository._git.ref(self.name)
 
260
        except KeyError:
 
261
            return None
 
262
 
 
263
    def set_last_revision_info(self, revno, revid):
 
264
        self.set_last_revision(revid)
 
265
 
 
266
    def set_last_revision(self, revid):
 
267
        (self.head, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
 
268
                revid)
 
269
 
 
270
    def _set_head(self, value):
 
271
        self._head = value
 
272
        self.repository._git.refs[self.name] = self._head
 
273
        self._clear_cached_state()
 
274
 
 
275
    head = property(_get_head, _set_head)
 
276
 
169
277
    def get_config(self):
170
278
        return GitBranchConfig(self)
171
279
 
182
290
    def supports_tags(self):
183
291
        return True
184
292
 
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
 
 
 
293
 
 
294
class GitBranchPullResult(branch.PullResult):
 
295
 
 
296
    def report(self, to_file):
 
297
        if not is_quiet():
 
298
            if self.old_revid == self.new_revid:
 
299
                to_file.write('No revisions to pull.\n')
 
300
            else:
 
301
                to_file.write('Now on revision %d (git sha: %s).\n' % 
 
302
                        (self.new_revno, self.new_git_head))
 
303
        self._show_tag_conficts(to_file)
 
304
 
 
305
 
 
306
class GitBranchPushResult(branch.BranchPushResult):
 
307
 
 
308
    def _lookup_revno(self, revid):
 
309
        assert isinstance(revid, str), "was %r" % revid
 
310
        # Try in source branch first, it'll be faster
 
311
        try:
 
312
            return self.source_branch.revision_id_to_revno(revid)
 
313
        except NoSuchRevision:
 
314
            # FIXME: Check using graph.find_distance_to_null() ?
 
315
            return self.target_branch.revision_id_to_revno(revid)
 
316
 
 
317
    @property
 
318
    def old_revno(self):
 
319
        return self._lookup_revno(self.old_revid)
 
320
 
 
321
    @property
 
322
    def new_revno(self):
 
323
        return self._lookup_revno(self.new_revid)
 
324
 
 
325
 
 
326
class InterFromGitBranch(branch.GenericInterBranch):
 
327
    """InterBranch implementation that pulls from Git into bzr."""
 
328
 
 
329
    @classmethod
 
330
    def is_compatible(self, source, target):
 
331
        return (isinstance(source, GitBranch) and 
 
332
                not isinstance(target, GitBranch))
 
333
 
 
334
    def update_revisions(self, stop_revision=None, overwrite=False,
 
335
        graph=None):
 
336
        """See InterBranch.update_revisions()."""
 
337
        interrepo = repository.InterRepository.get(self.source.repository, 
 
338
            self.target.repository)
 
339
        self._head = None
 
340
        self._last_revid = None
 
341
        def determine_wants(heads):
 
342
            if not self.source.name in heads:
 
343
                raise NoSuchRef(self.source.name, heads.keys())
 
344
            if stop_revision is not None:
 
345
                self._last_revid = stop_revision
 
346
                self._head, mapping = self.source.repository.lookup_git_revid(
 
347
                    stop_revision)
 
348
            else:
 
349
                self._head = heads[self.source.name]
 
350
                self._last_revid = \
 
351
                    self.source.mapping.revision_id_foreign_to_bzr(self._head)
 
352
            if self.target.repository.has_revision(self._last_revid):
 
353
                return []
 
354
            return [self._head]
 
355
        interrepo.fetch_objects(determine_wants, self.source.mapping)
 
356
        if overwrite:
 
357
            prev_last_revid = None
 
358
        else:
 
359
            prev_last_revid = self.target.last_revision()
 
360
        self.target.generate_revision_history(self._last_revid, prev_last_revid)
 
361
 
 
362
    def pull(self, overwrite=False, stop_revision=None,
 
363
             possible_transports=None, _hook_master=None, run_hooks=True,
 
364
             _override_hook_target=None, local=False):
 
365
        """See Branch.pull.
 
366
 
 
367
        :param _hook_master: Private parameter - set the branch to
 
368
            be supplied as the master to pull hooks.
 
369
        :param run_hooks: Private parameter - if false, this branch
 
370
            is being called because it's the master of the primary branch,
 
371
            so it should not run its hooks.
 
372
        :param _override_hook_target: Private parameter - set the branch to be
 
373
            supplied as the target_branch to pull hooks.
 
374
        """
 
375
        # This type of branch can't be bound.
 
376
        if local:
 
377
            raise errors.LocalRequiresBoundBranch()
 
378
        result = GitBranchPullResult()
 
379
        result.source_branch = self.source
 
380
        if _override_hook_target is None:
 
381
            result.target_branch = self.target
 
382
        else:
 
383
            result.target_branch = _override_hook_target
 
384
        self.source.lock_read()
 
385
        try:
 
386
            # We assume that during 'pull' the target repository is closer than
 
387
            # the source one.
 
388
            graph = self.target.repository.get_graph(self.source.repository)
 
389
            result.old_revno, result.old_revid = \
 
390
                self.target.last_revision_info()
 
391
            self.update_revisions(stop_revision, overwrite=overwrite, 
 
392
                graph=graph)
 
393
            result.new_git_head = self._head
 
394
            result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
395
                overwrite)
 
396
            result.new_revno, result.new_revid = self.target.last_revision_info()
 
397
            if _hook_master:
 
398
                result.master_branch = _hook_master
 
399
                result.local_branch = result.target_branch
 
400
            else:
 
401
                result.master_branch = result.target_branch
 
402
                result.local_branch = None
 
403
            if run_hooks:
 
404
                for hook in branch.Branch.hooks['post_pull']:
 
405
                    hook(result)
 
406
        finally:
 
407
            self.source.unlock()
 
408
        return result
 
409
 
 
410
    def _basic_push(self, overwrite=False, stop_revision=None):
 
411
        result = branch.BranchPushResult()
 
412
        result.source_branch = self.source
 
413
        result.target_branch = self.target
 
414
        graph = self.target.repository.get_graph(self.source.repository)
 
415
        result.old_revno, result.old_revid = self.target.last_revision_info()
 
416
        self.update_revisions(stop_revision, overwrite=overwrite, 
 
417
            graph=graph)
 
418
        result.new_git_head = self._head
 
419
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
 
420
            overwrite)
 
421
        result.new_revno, result.new_revid = self.target.last_revision_info()
 
422
        return result
 
423
 
 
424
 
 
425
class InterGitBranch(branch.GenericInterBranch):
 
426
    """InterBranch implementation that pulls between Git branches."""
 
427
 
 
428
 
 
429
class InterGitLocalRemoteBranch(InterGitBranch):
 
430
    """InterBranch that copies from a local to a remote git branch."""
 
431
 
 
432
    @classmethod
 
433
    def is_compatible(self, source, target):
 
434
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
435
        return (isinstance(source, LocalGitBranch) and 
 
436
                isinstance(target, RemoteGitBranch))
 
437
 
 
438
    def _basic_push(self, overwrite=False, stop_revision=None):
 
439
        result = GitBranchPushResult()
 
440
        result.source_branch = self.source
 
441
        result.target_branch = self.target
 
442
        if stop_revision is None:
 
443
            stop_revision = self.source.last_revision()
 
444
        # FIXME: Check for diverged branches
 
445
        def get_changed_refs(old_refs):
 
446
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs["refs/heads/master"])
 
447
            refs = { "refs/heads/master": self.source.repository.lookup_git_revid(stop_revision)[0] }
 
448
            result.new_revid = stop_revision
 
449
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
 
450
                refs["refs/tags/%s" % name] = sha
 
451
            return refs
 
452
        self.target.repository.send_pack(get_changed_refs, 
 
453
                self.source.repository._git.object_store.generate_pack_contents)
 
454
        return result
 
455
 
 
456
 
 
457
class InterGitRemoteLocalBranch(InterGitBranch):
 
458
    """InterBranch that copies from a remote to a local git branch."""
 
459
 
 
460
    @classmethod
 
461
    def is_compatible(self, source, target):
 
462
        from bzrlib.plugins.git.remote import RemoteGitBranch
 
463
        return (isinstance(source, RemoteGitBranch) and 
 
464
                isinstance(target, LocalGitBranch))
 
465
 
 
466
    def _basic_push(self, overwrite=False, stop_revision=None):
 
467
        result = branch.BranchPushResult()
 
468
        result.source_branch = self.source
 
469
        result.target_branch = self.target
 
470
        result.old_revid = self.target.last_revision()
 
471
        refs, stop_revision = self.update_refs(stop_revision)
 
472
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
473
        self.update_tags(refs)
 
474
        result.new_revid = self.target.last_revision()
 
475
        return result
 
476
 
 
477
    def update_tags(self, refs):
 
478
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
 
479
            self.target.tags.set_tag(name, revid)
 
480
 
 
481
    def update_refs(self, stop_revision=None):
 
482
        interrepo = repository.InterRepository.get(self.source.repository, 
 
483
            self.target.repository)
 
484
        if stop_revision is None:
 
485
            refs = interrepo.fetch_refs(branches=["HEAD"])
 
486
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
 
487
        else:
 
488
            refs = interrepo.fetch_refs(revision_id=stop_revision)
 
489
        return refs, stop_revision
 
490
 
 
491
    def pull(self, stop_revision=None, overwrite=False, 
 
492
        possible_transports=None, local=False):
 
493
        # This type of branch can't be bound.
 
494
        if local:
 
495
            raise errors.LocalRequiresBoundBranch()
 
496
        result = GitPullResult()
 
497
        result.source_branch = self.source
 
498
        result.target_branch = self.target
 
499
        result.old_revid = self.target.last_revision()
 
500
        refs, stop_revision = self.update_refs(stop_revision)
 
501
        self.target.generate_revision_history(stop_revision, result.old_revid)
 
502
        self.update_tags(refs)
 
503
        result.new_revid = self.target.last_revision()
 
504
        return result
 
505
 
 
506
    
 
507
class InterToGitBranch(branch.InterBranch):
 
508
    """InterBranch implementation that pulls from Git into bzr."""
 
509
 
 
510
    @classmethod
 
511
    def is_compatible(self, source, target):
 
512
        return (not isinstance(source, GitBranch) and 
 
513
                isinstance(target, GitBranch))
 
514
 
 
515
    def push(self, overwrite=True, stop_revision=None, 
 
516
             _override_hook_source_branch=None):
 
517
        raise NoPushSupport()
 
518
 
 
519
    def lossy_push(self, stop_revision=None):
 
520
        result = GitBranchPushResult()
 
521
        result.source_branch = self.source
 
522
        result.target_branch = self.target
 
523
        result.old_revid = self.target.last_revision()
 
524
        if stop_revision is None:
 
525
            stop_revision = self.source.last_revision()
 
526
        # FIXME: Check for diverged branches
 
527
        refs = { "refs/heads/master": stop_revision }
 
528
        for name, revid in self.source.tags.get_tag_dict().iteritems():
 
529
            if self.source.repository.has_revision(revid):
 
530
                refs["refs/tags/%s" % name] = revid
 
531
        revidmap, new_refs = self.target.repository.dfetch_refs(
 
532
            self.source.repository, refs)
 
533
        if revidmap != {}:
 
534
            self.target.generate_revision_history(revidmap[stop_revision])
 
535
        result.new_revid = self.target.last_revision()
 
536
        result.revidmap = revidmap
 
537
        return result
 
538
 
 
539
 
 
540
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
 
541
branch.InterBranch.register_optimiser(InterFromGitBranch)
 
542
branch.InterBranch.register_optimiser(InterToGitBranch)
 
543
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)