← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Martin Pool
  • Date: 2007-02-07 12:41:45 UTC
  • mto: This revision was merged to the branch mainline in revision 2283.
  • Revision ID: mbp@sourcefrog.net-20070207124145-qufbufe41sm6fqrf
Get rid of RepositoryFormat*_instance objects.  Instead the format
registry can hold either format objects or factories that create them, and
its get() method calls that if needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1833
1833
 
1834
1834
    def convert(self, to_convert, pb):
1835
1835
        """See Converter.convert()."""
1836
 
        from bzrlib.repofmt.weaverepo import RepositoryFormat7_instance
 
1836
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
1837
1837
        from bzrlib.branch import BzrBranchFormat5
1838
1838
        self.bzrdir = to_convert
1839
1839
        self.pb = pb
1869
1869
        # we hard code the formats here because we are converting into
1870
1870
        # the meta format. The meta format upgrader can take this to a 
1871
1871
        # future format within each component.
1872
 
        self.put_format('repository', RepositoryFormat7_instance)
 
1872
        self.put_format('repository', RepositoryFormat7())
1873
1873
        for entry in repository_names:
1874
1874
            self.move_entry('repository', entry)
1875
1875