/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

Update docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
24
24
 
25
25
from bzrlib import (
26
26
    branch,
27
 
    bzrdir,
28
27
    config,
29
28
    errors,
30
29
    foreign,
41
40
    mutter,
42
41
    )
43
42
 
44
 
from bzrlib.plugins.git import (
45
 
    get_rich_root_format,
46
 
    )
47
43
from bzrlib.plugins.git.config import (
48
44
    GitBranchConfig,
49
45
    )
50
46
from bzrlib.plugins.git.errors import (
51
 
    NoPushSupport,
52
47
    NoSuchRef,
53
48
    )
54
49
 
95
90
 
96
91
    def get_tag_dict(self):
97
92
        ret = {}
98
 
        for k,v in self.repository._git.refs.as_dict("refs/tags").iteritems():
 
93
        for k,v in self.repository._git.tags.iteritems():
99
94
            obj = self.repository._git.get_object(v)
100
95
            while isinstance(obj, Tag):
101
96
                v = obj.object[1]
108
103
        return ret
109
104
 
110
105
    def set_tag(self, name, revid):
111
 
        self.repository._git.refs["refs/tags/%s" % name], _ = \
 
106
        self.repository._git.tags[name], _ = \
112
107
            self.branch.mapping.revision_id_bzr_to_foreign(revid)
113
108
 
114
109
 
156
151
    def __repr__(self):
157
152
        return "%s(%r, %r)" % (self.__class__.__name__, self.repository.base, self.name)
158
153
 
 
154
    def dpull(self, source, stop_revision=None):
 
155
        if stop_revision is None:
 
156
            stop_revision = source.last_revision()
 
157
        # FIXME: Check for diverged branches
 
158
        refs = { "refs/heads/master": stop_revision }
 
159
        for name, revid in source.tags.get_tag_dict().iteritems():
 
160
            if source.repository.has_revision(revid):
 
161
                refs["refs/tags/%s" % name] = revid
 
162
        revidmap, new_refs = self.repository.dfetch_refs(source.repository, 
 
163
                refs)
 
164
        if revidmap != {}:
 
165
            self.generate_revision_history(revidmap[stop_revision])
 
166
        return revidmap
 
167
 
159
168
    def generate_revision_history(self, revid, old_revid=None):
160
169
        # FIXME: Check that old_revid is in the ancestry of revid
161
170
        newhead, self.mapping = self.mapping.revision_id_bzr_to_foreign(revid)
189
198
    def get_physical_lock_status(self):
190
199
        return False
191
200
 
 
201
 
 
202
class LocalGitBranch(GitBranch):
 
203
    """A local Git branch."""
 
204
 
192
205
    @needs_read_lock
193
206
    def last_revision(self):
194
207
        # perhaps should escape this ?
196
209
            return revision.NULL_REVISION
197
210
        return self.mapping.revision_id_foreign_to_bzr(self.head)
198
211
 
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
212
    def _get_checkout_format(self):
208
213
        """Return the most suitable metadir for a checkout of this branch.
209
214
        Weaves are used if this branch's repository uses weaves.
237
242
        :param hardlink: Whether to hardlink
238
243
        :return: WorkingTree object of checkout.
239
244
        """
240
 
        checkout_branch = bzrdir.BzrDir.create_branch_convenience(
 
245
        checkout_branch = BzrDir.create_branch_convenience(
241
246
            to_location, force_new_tree=False, format=get_rich_root_format())
242
247
        checkout = checkout_branch.bzrdir
243
248
        checkout_branch.bind(self)
255
260
        return ret
256
261
 
257
262
    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
 
        (newhead, self.mapping) = self.mapping.revision_id_bzr_to_foreign(
268
 
                revid)
269
 
        self.head = newhead
 
263
        return self.repository._git.ref(self.name)
270
264
 
271
265
    def _set_head(self, value):
272
266
        self._head = value
273
 
        self.repository._git.refs[self.name] = self._head
 
267
        self.repository._git.set_ref(self.name, self._head)
274
268
        self._clear_cached_state()
275
269
 
276
270
    head = property(_get_head, _set_head)
304
298
        self._show_tag_conficts(to_file)
305
299
 
306
300
 
307
 
class GitBranchPushResult(branch.BranchPushResult):
308
 
 
309
 
    def _lookup_revno(self, revid):
310
 
        assert isinstance(revid, str), "was %r" % revid
311
 
        # Try in source branch first, it'll be faster
312
 
        try:
313
 
            return self.source_branch.revision_id_to_revno(revid)
314
 
        except errors.NoSuchRevision:
315
 
            # FIXME: Check using graph.find_distance_to_null() ?
316
 
            return self.target_branch.revision_id_to_revno(revid)
317
 
 
318
 
    @property
319
 
    def old_revno(self):
320
 
        return self._lookup_revno(self.old_revid)
321
 
 
322
 
    @property
323
 
    def new_revno(self):
324
 
        return self._lookup_revno(self.new_revid)
325
 
 
326
 
 
327
 
class InterFromGitBranch(branch.GenericInterBranch):
 
301
class InterGitGenericBranch(branch.InterBranch):
328
302
    """InterBranch implementation that pulls from Git into bzr."""
329
303
 
330
304
    @classmethod
408
382
            self.source.unlock()
409
383
        return result
410
384
 
411
 
    def _basic_push(self, overwrite=False, stop_revision=None):
412
 
        result = branch.BranchPushResult()
413
 
        result.source_branch = self.source
414
 
        result.target_branch = self.target
415
 
        graph = self.target.repository.get_graph(self.source.repository)
416
 
        result.old_revno, result.old_revid = self.target.last_revision_info()
417
 
        self.update_revisions(stop_revision, overwrite=overwrite, 
418
 
            graph=graph)
419
 
        result.new_git_head = self._head
420
 
        result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
421
 
            overwrite)
422
 
        result.new_revno, result.new_revid = self.target.last_revision_info()
423
 
        return result
424
 
 
425
 
 
426
 
class InterGitBranch(branch.GenericInterBranch):
 
385
 
 
386
 
 
387
 
 
388
branch.InterBranch.register_optimiser(InterGitGenericBranch)
 
389
 
 
390
 
 
391
class InterGitRemoteLocalBranch(branch.InterBranch):
427
392
    """InterBranch implementation that pulls between Git branches."""
428
393
 
429
 
 
430
 
class InterGitLocalRemoteBranch(InterGitBranch):
431
 
    """InterBranch that copies from a local to a remote git branch."""
432
 
 
433
 
    @classmethod
434
 
    def is_compatible(self, source, target):
435
 
        from bzrlib.plugins.git.remote import RemoteGitBranch
436
 
        return (isinstance(source, LocalGitBranch) and 
437
 
                isinstance(target, RemoteGitBranch))
438
 
 
439
 
    def _basic_push(self, overwrite=False, stop_revision=None):
440
 
        result = GitBranchPushResult()
441
 
        result.source_branch = self.source
442
 
        result.target_branch = self.target
443
 
        if stop_revision is None:
444
 
            stop_revision = self.source.last_revision()
445
 
        # FIXME: Check for diverged branches
446
 
        def get_changed_refs(old_refs):
447
 
            result.old_revid = self.target.mapping.revision_id_foreign_to_bzr(old_refs.get("refs/heads/master", "0" * 40))
448
 
            refs = { "refs/heads/master": self.source.repository.lookup_git_revid(stop_revision)[0] }
449
 
            result.new_revid = stop_revision
450
 
            for name, sha in self.source.repository._git.refs.as_dict("refs/tags").iteritems():
451
 
                refs["refs/tags/%s" % name] = sha
452
 
            return refs
453
 
        self.target.repository.send_pack(get_changed_refs, 
454
 
                self.source.repository._git.object_store.generate_pack_contents)
455
 
        return result
456
 
 
457
 
 
458
 
class InterGitRemoteLocalBranch(InterGitBranch):
459
 
    """InterBranch that copies from a remote to a local git branch."""
460
 
 
461
394
    @classmethod
462
395
    def is_compatible(self, source, target):
463
396
        from bzrlib.plugins.git.remote import RemoteGitBranch
464
397
        return (isinstance(source, RemoteGitBranch) and 
465
398
                isinstance(target, LocalGitBranch))
466
399
 
467
 
    def _basic_push(self, overwrite=False, stop_revision=None):
468
 
        result = branch.BranchPushResult()
 
400
    def pull(self, stop_revision=None, overwrite=False, 
 
401
        possible_transports=None, local=False):
 
402
        # This type of branch can't be bound.
 
403
        if local:
 
404
            raise errors.LocalRequiresBoundBranch()
 
405
        result = GitPullResult()
469
406
        result.source_branch = self.source
470
407
        result.target_branch = self.target
471
 
        result.old_revid = self.target.last_revision()
472
 
        refs, stop_revision = self.update_refs(stop_revision)
473
 
        self.target.generate_revision_history(stop_revision, result.old_revid)
474
 
        self.update_tags(refs)
475
 
        result.new_revid = self.target.last_revision()
476
 
        return result
477
 
 
478
 
    def update_tags(self, refs):
479
 
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
480
 
            self.target.tags.set_tag(name, revid)
481
 
 
482
 
    def update_refs(self, stop_revision=None):
483
408
        interrepo = repository.InterRepository.get(self.source.repository, 
484
409
            self.target.repository)
 
410
        result.old_revid = self.target.last_revision()
485
411
        if stop_revision is None:
486
412
            refs = interrepo.fetch_refs(branches=["HEAD"])
487
413
            stop_revision = self.target.mapping.revision_id_foreign_to_bzr(refs["HEAD"])
488
414
        else:
489
415
            refs = interrepo.fetch_refs(revision_id=stop_revision)
490
 
        return refs, stop_revision
491
 
 
492
 
    def pull(self, stop_revision=None, overwrite=False, 
493
 
        possible_transports=None, local=False):
494
 
        # This type of branch can't be bound.
495
 
        if local:
496
 
            raise errors.LocalRequiresBoundBranch()
497
 
        result = GitPullResult()
498
 
        result.source_branch = self.source
499
 
        result.target_branch = self.target
500
 
        result.old_revid = self.target.last_revision()
501
 
        refs, stop_revision = self.update_refs(stop_revision)
502
416
        self.target.generate_revision_history(stop_revision, result.old_revid)
503
 
        self.update_tags(refs)
 
417
        for name, revid in extract_tags(refs, self.target.mapping).iteritems():
 
418
            self.target.tags.set_tag(name, revid)
504
419
        result.new_revid = self.target.last_revision()
505
420
        return result
506
421
 
507
 
    
508
 
class InterToGitBranch(branch.InterBranch):
509
 
    """InterBranch implementation that pulls from Git into bzr."""
510
 
 
511
 
    @classmethod
512
 
    def is_compatible(self, source, target):
513
 
        return (not isinstance(source, GitBranch) and 
514
 
                isinstance(target, GitBranch))
515
 
 
516
 
    def update_revisions(self, *args, **kwargs):
517
 
        raise NoPushSupport()
518
 
 
519
 
    def push(self, overwrite=True, stop_revision=None, 
520
 
             _override_hook_source_branch=None):
521
 
        raise NoPushSupport()
522
 
 
523
 
    def lossy_push(self, stop_revision=None):
524
 
        result = GitBranchPushResult()
525
 
        result.source_branch = self.source
526
 
        result.target_branch = self.target
527
 
        result.old_revid = self.target.last_revision()
528
 
        if stop_revision is None:
529
 
            stop_revision = self.source.last_revision()
530
 
        # FIXME: Check for diverged branches
531
 
        refs = { "refs/heads/master": stop_revision }
532
 
        for name, revid in self.source.tags.get_tag_dict().iteritems():
533
 
            if self.source.repository.has_revision(revid):
534
 
                refs["refs/tags/%s" % name] = revid
535
 
        revidmap, new_refs = self.target.repository.dfetch_refs(
536
 
            self.source.repository, refs)
537
 
        if revidmap != {}:
538
 
            self.target.generate_revision_history(revidmap[stop_revision])
539
 
            result.new_revid = revidmap[stop_revision]
540
 
        else:
541
 
            result.new_revid = result.old_revid
542
 
        result.revidmap = revidmap
543
 
        return result
544
 
 
545
422
 
546
423
branch.InterBranch.register_optimiser(InterGitRemoteLocalBranch)
547
 
branch.InterBranch.register_optimiser(InterFromGitBranch)
548
 
branch.InterBranch.register_optimiser(InterToGitBranch)
549
 
branch.InterBranch.register_optimiser(InterGitLocalRemoteBranch)