← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.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/send.py
119
119
                    except KeyError:
120
120
                        strict = None
121
121
            if tree is not None and (strict is None or strict):
122
 
                changes = tree.changes_from(tree.basis_tree())
123
 
                if changes.has_changed() or len(tree.get_parent_ids()) > 1:
 
122
                if (tree.has_changes(tree.basis_tree())
 
123
                    or len(tree.get_parent_ids()) > 1):
124
124
                    raise errors.UncommittedChanges(
125
125
                        tree, more='Use --no-strict to force the send.')
126
126
                if tree.last_revision() != tree.branch.last_revision():