← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-26 15:31:02 UTC
  • mto: (6437.3.28 2.5)
  • mto: This revision was merged to the branch mainline in revision 6451.
  • Revision ID: jelmer@samba.org-20120126153102-mzbhq2vtov09f1nf
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
113
113
 
114
114
    supports_workingtrees = False
115
115
 
 
116
    colocated_branches = False
 
117
 
116
118
    def __init__(self):
117
119
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
118
120
        # XXX: It's a bit ugly that the network name is here, because we'd
3122
3124
        if isinstance(a_bzrdir, RemoteBzrDir):
3123
3125
            a_bzrdir._ensure_real()
3124
3126
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
3125
 
                name, append_revisions_only=append_revisions_only)
 
3127
                name=name, append_revisions_only=append_revisions_only)
3126
3128
        else:
3127
3129
            # We assume the bzrdir is parameterised; it may not be.
3128
 
            result = self._custom_format.initialize(a_bzrdir, name,
 
3130
            result = self._custom_format.initialize(a_bzrdir, name=name,
3129
3131
                append_revisions_only=append_revisions_only)
3130
3132
        if (isinstance(a_bzrdir, RemoteBzrDir) and
3131
3133
            not isinstance(result, RemoteBranch)):
3322
3324
        # will try to assign to self.tags, which is a property in this subclass.
3323
3325
        # And the parent's __init__ doesn't do much anyway.
3324
3326
        self.bzrdir = remote_bzrdir
 
3327
        self.name = name
3325
3328
        if _client is not None:
3326
3329
            self._client = _client
3327
3330
        else: