← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Aaron Bentley
  • Date: 2008-04-12 05:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 3364.
  • Revision ID: aaron@aaronbentley.com-20080412054807-47yd7dgjufa0nf98
rename 'sharing' to 'use-shared'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
123
123
        return reconfiguration
124
124
 
125
125
    @classmethod
126
 
    def to_sharing(klass, bzrdir):
127
 
        """Convert a standalone branch into a sharing branch"""
 
126
    def to_use_shared(klass, bzrdir):
 
127
        """Convert a standalone branch into a repository branch"""
128
128
        reconfiguration = klass(bzrdir)
129
 
        reconfiguration._set_sharing(sharing=True)
 
129
        reconfiguration._set_use_shared(use_shared=True)
130
130
        if not reconfiguration.changes_planned():
131
 
            raise errors.AlreadySharing(bzrdir)
 
131
            raise errors.AlreadyUsingShared(bzrdir)
132
132
        return reconfiguration
133
133
 
134
134
    @classmethod
135
135
    def to_standalone(klass, bzrdir):
136
 
        """Convert a standalone branch into a sharing branch"""
 
136
        """Convert a repository branch into a standalone branch"""
137
137
        reconfiguration = klass(bzrdir)
138
 
        reconfiguration._set_sharing(sharing=False)
 
138
        reconfiguration._set_use_shared(use_shared=False)
139
139
        if not reconfiguration.changes_planned():
140
140
            raise errors.AlreadyStandalone(bzrdir)
141
141
        return reconfiguration
180
180
        if want_tree and self.tree is None:
181
181
            self._create_tree = True
182
182
 
183
 
    def _set_sharing(self, sharing=None):
184
 
        if sharing is None:
 
183
    def _set_use_shared(self, use_shared=None):
 
184
        if use_shared is None:
185
185
            return
186
 
        if sharing:
 
186
        if use_shared:
187
187
            if self.local_repository is not None:
188
188
                self._destroy_repository = True
189
189
        else: