← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Robert Collins
  • Date: 2009-03-06 04:38:56 UTC
  • mto: (4086.1.1 hpss-integration)
  • mto: This revision was merged to the branch mainline in revision 4087.
  • Revision ID: robertc@robertcollins.net-20090306043856-1w5vzs5ebv93zyda
Review feedback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
110
110
            if branch_ref is not None:
111
111
                # If there's a branch reference, the client will have to resolve
112
112
                # the branch reference to figure out the cloning metadir
113
 
                branch_name = ('reference', branch_ref)
 
113
                branch_name = ('ref', branch_ref)
114
114
            else:
115
 
                branch_name = (
116
 
                    'direct', control_format.get_branch_format().network_name())
 
115
                branch_name = ('branch',
 
116
                    control_format.get_branch_format().network_name())
117
117
            repository_name = control_format.repository_format.network_name()
118
118
        else:
119
119
            # Only MetaDir has delegated formats today.
120
 
            branch_name = ''
 
120
            branch_name = ('branch', '')
121
121
            repository_name = ''
122
122
        return SuccessfulSmartServerResponse((control_name, repository_name,
123
123
            branch_name))