← Back to branch summary

~lifeless/ubuntu/lucid/bzr/2.1.2-sru

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-06-27 15:23:34 UTC
  • mfrom: (1.3.1 upstream) (3.1.78 karmic)
  • Revision ID: james.westby@ubuntu.com-20090627152334-u3smexjpaolh96qd
* New upstream release.
* Bump standards version to 3.8.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Reconfigure a bzrdir into a new tree/branch/repository layout"""
18
18
 
31
31
            self.repository = self.bzrdir.find_repository()
32
32
        except errors.NoRepositoryPresent:
33
33
            self.repository = None
 
34
            self.local_repository = None
34
35
        else:
35
36
            if (self.repository.bzrdir.root_transport.base ==
36
37
                self.bzrdir.root_transport.base):
268
269
        if not force:
269
270
            self._check()
270
271
        if self._create_repository:
271
 
            repo = self.bzrdir.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
286
            if self.local_branch and not self._destroy_branch:
273
287
                repo.fetch(self.local_branch.repository,
274
288
                           self.local_branch.last_revision())
302
316
                local_branch.set_last_revision_info(*last_revision_info)
303
317
            if self._destroy_reference:
304
318
                self.referenced_branch.tags.merge_to(local_branch.tags)
 
319
                self.referenced_branch.update_references(local_branch)
305
320
        else:
306
321
            local_branch = self.local_branch
307
322
        if self._create_reference: