← 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-01-11 17:59:20 UTC
  • mto: This revision was merged to the branch mainline in revision 3177.
  • Revision ID: abentley@panoramicfeedback.com-20080111175920-dn202iylc1kfdfif
https://launchpad.net/bugs/179316
Reconfigure can safely be interrupted while fetching (#179316)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
216
216
        if self._create_branch and self.referenced_branch is not None:
217
217
            repo.fetch(self.referenced_branch.repository,
218
218
                       self.referenced_branch.last_revision())
 
219
        if self._create_reference:
 
220
            reference_branch = branch.Branch.open(self._select_bind_location())
 
221
        if self._destroy_repository:
 
222
            if self._create_reference:
 
223
                reference_branch.repository.fetch(self.repository)
219
224
        last_revision_info = None
220
225
        if self._destroy_reference:
221
226
            last_revision_info = self.referenced_branch.last_revision_info()
230
235
        else:
231
236
            local_branch = self.local_branch
232
237
        if self._create_reference:
233
 
            reference_branch = branch.Branch.open(self._select_bind_location())
234
238
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
235
239
                reference_branch)
236
240
        if self._destroy_tree:
243
247
            bind_location = self._select_bind_location()
244
248
            local_branch.bind(branch.Branch.open(bind_location))
245
249
        if self._destroy_repository:
246
 
            if self._create_reference:
247
 
                reference_branch.repository.fetch(self.repository)
248
250
            self.bzrdir.destroy_repository()