← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
17
17
"""bzr upgrade logic."""
18
18
 
19
19
 
20
 
from bzrlib.bzrdir import BzrDir, BzrDirFormat
 
20
from bzrlib.bzrdir import BzrDir, BzrDirFormat, format_registry
21
21
import bzrlib.errors as errors
22
22
from bzrlib.remote import RemoteBzrDir
23
23
from bzrlib.transport import get_transport
26
26
 
27
27
class Convert(object):
28
28
 
29
 
    def __init__(self, url, format):
30
 
        if format is None:
31
 
            format = BzrDirFormat.get_default_format()
 
29
    def __init__(self, url, format=None):
32
30
        self.format = format
33
31
        self.bzrdir = BzrDir.open_unsupported(url)
34
32
        if isinstance(self.bzrdir, RemoteBzrDir):
56
54
            # might not be a format we can open without upgrading; see e.g.
57
55
            # https://bugs.launchpad.net/bzr/+bug/253891
58
56
            pass
59
 
        if not self.bzrdir.needs_format_conversion(self.format):
 
57
        if self.format is None:
 
58
            try:
 
59
                rich_root = self.bzrdir.find_repository()._format.rich_root_data
 
60
            except errors.NoRepositoryPresent:
 
61
                rich_root = False # assume no rich roots
 
62
            if rich_root:
 
63
                format_name = "default-rich-root"
 
64
            else:
 
65
                format_name = "default"
 
66
            format = format_registry.make_bzrdir(format_name)
 
67
        else:
 
68
            format = self.format
 
69
        if not self.bzrdir.needs_format_conversion(format):
60
70
            raise errors.UpToDateFormat(self.bzrdir._format)
61
71
        if not self.bzrdir.can_convert_format():
62
72
            raise errors.BzrError("cannot upgrade from bzrdir format %s" %
63
73
                           self.bzrdir._format)
64
 
        self.bzrdir.check_conversion_target(self.format)
 
74
        self.bzrdir.check_conversion_target(format)
65
75
        self.pb.note('starting upgrade of %s', self.transport.base)
66
76
        self.bzrdir.backup_bzrdir()
67
 
        while self.bzrdir.needs_format_conversion(self.format):
68
 
            converter = self.bzrdir._format.get_converter(self.format)
 
77
        while self.bzrdir.needs_format_conversion(format):
 
78
            converter = self.bzrdir._format.get_converter(format)
69
79
            self.bzrdir = converter.convert(self.bzrdir, self.pb)
70
80
        self.pb.note("finished")
71
81