← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Robert Collins
  • Date: 2007-03-06 06:35:00 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306063500-ihgarcmlv48p2gu0
Remove knit2 repository format- it has never been supported.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
923
923
 
924
924
for _name in [
925
925
        'KnitRepository',
926
 
        'KnitRepository2',
927
926
        'RepositoryFormatKnit',
928
927
        'RepositoryFormatKnit1',
929
 
        'RepositoryFormatKnit2',
930
928
        ]:
931
929
    __make_delegated(_name, 'bzrlib.repofmt.knitrepo')
932
930
 
1260
1258
format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
1261
1259
 
1262
1260
format_registry.register_lazy(
1263
 
    'Bazaar Knit Repository Format 2\n',
1264
 
    'bzrlib.repofmt.knitrepo',
1265
 
    'RepositoryFormatKnit2',
1266
 
    )
1267
 
 
1268
 
format_registry.register_lazy(
1269
1261
    'Bazaar Knit Repository Format 3\n',
1270
1262
    'bzrlib.repofmt.knitrepo',
1271
1263
    'RepositoryFormatKnit3',
1660
1652
 
1661
1653
    @staticmethod
1662
1654
    def is_compatible(source, target):
1663
 
        """Be compatible with Knit1 source and Knit2 target"""
1664
 
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit2
 
1655
        """Be compatible with Knit1 source and Knit3 target"""
 
1656
        from bzrlib.repofmt.knitrepo import RepositoryFormatKnit3
1665
1657
        try:
1666
1658
            from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1, \
1667
 
                    RepositoryFormatKnit2
 
1659
                    RepositoryFormatKnit3
1668
1660
            return (isinstance(source._format, (RepositoryFormatKnit1)) and
1669
 
                    isinstance(target._format, (RepositoryFormatKnit2)))
 
1661
                    isinstance(target._format, (RepositoryFormatKnit3)))
1670
1662
        except AttributeError:
1671
1663
            return False
1672
1664
 
1776
1768
        # here.
1777
1769
        result.append((InterModel1and2,
1778
1770
                       weaverepo.RepositoryFormat5(),
1779
 
                       knitrepo.RepositoryFormatKnit2()))
 
1771
                       knitrepo.RepositoryFormatKnit3()))
1780
1772
        result.append((InterKnit1and2,
1781
1773
                       knitrepo.RepositoryFormatKnit1(),
1782
 
                       knitrepo.RepositoryFormatKnit2()))
 
1774
                       knitrepo.RepositoryFormatKnit3()))
1783
1775
        return result
1784
1776
 
1785
1777