← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-07-10 09:37:08 UTC
  • mfrom: (4524.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090710093708-s3ru5i9avw0pykjm
(vila) Quicker check for changes in mutable trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
243
243
 
244
244
        if self.other_rev_id is None:
245
245
            other_basis_tree = self.revision_tree(self.other_basis)
246
 
            changes = other_basis_tree.changes_from(self.other_tree)
247
 
            if changes.has_changed():
 
246
            if other_basis_tree.has_changes(self.other_tree):
248
247
                raise WorkingTreeNotRevision(self.this_tree)
249
248
            other_rev_id = self.other_basis
250
249
            self.other_tree = other_basis_tree
276
275
            basis_tree = self.revision_tree(self.this_tree.last_revision())
277
276
        except errors.NoSuchRevision:
278
277
            basis_tree = self.this_tree.basis_tree()
279
 
        changes = self.this_tree.changes_from(basis_tree)
280
 
        if not changes.has_changed():
 
278
        if not self.this_tree.has_changes(basis_tree):
281
279
            self.this_rev_id = self.this_basis
282
280
 
283
281
    def set_interesting_files(self, file_list):