← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/bzrdir.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/bzrdir.py
16
16
 
17
17
"""Weave-era BzrDir formats."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib.bzrdir import (
20
22
    BzrDir,
21
23
    BzrDirFormat,
964
966
        from bzrlib.plugins.weave_fmt.repository import RepositoryFormat5
965
967
        return RepositoryFormat5().open(self, _found=True)
966
968
 
967
 
    def open_workingtree(self, _unsupported=False,
 
969
    def open_workingtree(self, unsupported=False,
968
970
            recommend_upgrade=True):
969
971
        """See BzrDir.create_workingtree."""
970
972
        from bzrlib.plugins.weave_fmt.workingtree import WorkingTreeFormat2
989
991
        from bzrlib.plugins.weave_fmt.repository import RepositoryFormat6
990
992
        return RepositoryFormat6().open(self, _found=True)
991
993
 
992
 
    def open_workingtree(self, _unsupported=False,
993
 
        recommend_upgrade=True):
 
994
    def open_workingtree(self, unsupported=False, recommend_upgrade=True):
994
995
        """See BzrDir.create_workingtree."""
995
996
        # we don't warn here about upgrades; that ought to be handled for the
996
997
        # bzrdir as a whole