← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconfigure.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconfigure.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
82
82
            self.repository = None
83
83
            self.local_repository = None
84
84
        else:
85
 
            if (self.repository.bzrdir.root_transport.base ==
86
 
                self.bzrdir.root_transport.base):
 
85
            if (self.repository.user_url == self.bzrdir.user_url):
87
86
                self.local_repository = self.repository
88
87
            else:
89
88
                self.local_repository = None
90
89
        try:
91
90
            branch = self.bzrdir.open_branch()
92
 
            if branch.bzrdir.root_transport.base == bzrdir.root_transport.base:
 
91
            if branch.user_url == bzrdir.user_url:
93
92
                self.local_branch = branch
94
93
                self.referenced_branch = None
95
94
            else:
217
216
            if not want_reference:
218
217
                self._create_repository = True
219
218
        else:
220
 
            if want_reference and (self.repository.bzrdir.root_transport.base
221
 
                                   == self.bzrdir.root_transport.base):
 
219
            if want_reference and (
 
220
                self.repository.user_url == self.bzrdir.user_url):
222
221
                if not self.repository.is_shared():
223
222
                    self._destroy_repository = True
224
223
        if self.referenced_branch is None:
265
264
 
266
265
    def _check(self):
267
266
        """Raise if reconfiguration would destroy local changes"""
268
 
        if self._destroy_tree:
269
 
            # XXX: What about pending merges ? -- vila 20090629
270
 
            if self.tree.has_changes(self.tree.basis_tree()):
 
267
        if self._destroy_tree and self.tree.has_changes():
271
268
                raise errors.UncommittedChanges(self.tree)
272
269
        if self._create_reference and self.local_branch is not None:
273
270
            reference_branch = branch.Branch.open(self._select_bind_location())
346
343
            if self._create_reference:
347
344
                reference_branch.repository.fetch(self.repository)
348
345
            elif self.local_branch is not None and not self._destroy_branch:
349
 
                up = self.local_branch.bzrdir.root_transport.clone('..')
 
346
                up = self.local_branch.user_transport.clone('..')
350
347
                up_bzrdir = bzrdir.BzrDir.open_containing_from_transport(up)[0]
351
348
                new_repo = up_bzrdir.find_repository()
352
349
                new_repo.fetch(self.repository)
370
367
            local_branch = self.local_branch
371
368
        if self._create_reference:
372
369
            format = branch.BranchReferenceFormat().initialize(self.bzrdir,
373
 
                reference_branch)
 
370
                target_branch=reference_branch)
374
371
        if self._destroy_tree:
375
372
            self.bzrdir.destroy_workingtree()
376
373
        if self._create_tree: