← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-06 20:45:48 UTC
  • mfrom: (4728.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091006204548-bjnc3z4k256ppimz
MutableTree.has_changes() does not require a tree parameter anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
461
461
            raise errors.BzrCommandError("You cannot remove the working tree"
462
462
                                         " of a remote path")
463
463
        if not force:
464
 
            if (working.has_changes(working.basis_tree())
465
 
                or len(working.get_parent_ids()) > 1):
 
464
            if (working.has_changes()):
466
465
                raise errors.UncommittedChanges(working)
467
466
 
468
467
        working_path = working.bzrdir.root_transport.base
1109
1108
        else:
1110
1109
            revision_id = None
1111
1110
        if strict and tree is not None and revision_id is None:
1112
 
            if (tree.has_changes(tree.basis_tree())
1113
 
                or len(tree.get_parent_ids()) > 1):
 
1111
            if (tree.has_changes()):
1114
1112
                raise errors.UncommittedChanges(
1115
1113
                    tree, more='Use --no-strict to force the push.')
1116
1114
            if tree.last_revision() != tree.branch.last_revision():
3663
3661
 
3664
3662
        # die as quickly as possible if there are uncommitted changes
3665
3663
        if not force:
3666
 
            if tree.has_changes(basis_tree) or len(tree.get_parent_ids()) > 1:
 
3664
            if tree.has_changes():
3667
3665
                raise errors.UncommittedChanges(tree)
3668
3666
 
3669
3667
        view_info = _get_view_info_for_change_reporter(tree)
3720
3718
                                       merger.other_rev_id)
3721
3719
                    result.report(self.outf)
3722
3720
                    return 0
3723
 
            merger.check_basis(False)
 
3721
            if merger.this_basis is None:
 
3722
                raise errors.BzrCommandError(
 
3723
                    "This branch has no commits."
 
3724
                    " (perhaps you would prefer 'bzr pull')")
3724
3725
            if preview:
3725
3726
                return self._do_preview(merger, cleanups)
3726
3727
            elif interactive: