← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-21 19:45:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6156.
  • Revision ID: jelmer@samba.org-20110921194557-nl14sk8y9xlrshpt
Use fixed_components setting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
150
150
        control_format = self._bzrdir.cloning_metadir(
151
151
            require_stacking=require_stacking)
152
152
        control_name = control_format.network_name()
153
 
        # XXX: There should be a method that tells us that the format does/does
154
 
        # not have subformats.
155
 
        if isinstance(control_format, BzrDirMetaFormat1):
 
153
        if not control_format.fixed_components:
156
154
            branch_name = ('branch',
157
155
                control_format.get_branch_format().network_name())
158
156
            repository_name = control_format.repository_format.network_name()