← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Johan Walles
  • Date: 2009-05-06 05:36:28 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090506053628-tbf1wz4a0m9t684g
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
269
269
        if not force:
270
270
            self._check()
271
271
        if self._create_repository:
272
 
            if self.local_branch and not self._destroy_branch:
273
 
                old_repo = self.local_branch.repository
274
 
            elif self._create_branch and self.referenced_branch is not None:
275
 
                old_repo = self.referenced_branch.repository
276
 
            else:
277
 
                old_repo = None
278
 
            if old_repo is not None:
279
 
                repository_format = old_repo._format
280
 
            else:
281
 
                repository_format = None
282
 
            if repository_format is not None:
283
 
                repo = repository_format.initialize(self.bzrdir)
284
 
            else:
285
 
                repo = self.bzrdir.create_repository()
 
272
            repo = self.bzrdir.create_repository()
286
273
            if self.local_branch and not self._destroy_branch:
287
274
                repo.fetch(self.local_branch.repository,
288
275
                           self.local_branch.last_revision())