/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 utf8 invalid data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
branch.py
419
419
class InterFromGitBranch(branch.GenericInterBranch):
420
420
    """InterBranch implementation that pulls from Git into bzr."""
421
421
 
 
422
    @staticmethod
 
423
    def _get_branch_formats_to_test():
 
424
        return []
 
425
 
422
426
    @classmethod
423
427
    def _get_interrepo(self, source, target):
424
428
        return repository.InterRepository.get(source.repository,
455
459
            if self.target.repository.has_revision(self._last_revid):
456
460
                return []
457
461
            return [head]
458
 
        pack_hint, head = interrepo.fetch_objects(
 
462
        pack_hint, head, refs = interrepo.fetch_objects(
459
463
            determine_wants, self.source.mapping, limit=limit)
460
464
        if (pack_hint is not None and
461
465
            self.target.repository._format.pack_compresses):
546
550
class InterGitLocalRemoteBranch(InterGitBranch):
547
551
    """InterBranch that copies from a local to a remote git branch."""
548
552
 
 
553
    @staticmethod
 
554
    def _get_branch_formats_to_test():
 
555
        return []
 
556
 
549
557
    @classmethod
550
558
    def is_compatible(self, source, target):
551
559
        from bzrlib.plugins.git.remote import RemoteGitBranch
575
583
class InterGitRemoteLocalBranch(InterGitBranch):
576
584
    """InterBranch that copies from a remote to a local git branch."""
577
585
 
 
586
    @staticmethod
 
587
    def _get_branch_formats_to_test():
 
588
        return []
 
589
 
578
590
    @classmethod
579
591
    def is_compatible(self, source, target):
580
592
        from bzrlib.plugins.git.remote import RemoteGitBranch