← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Robert Collins
  • Date: 2010-04-10 09:22:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5142.
  • Revision ID: robertc@robertcollins.net-20100410092204-jrdwwf7vtfr0t41k
``bzrlib.mutabletree.MutableTree.commit`` will now support a passed in
config as in previous versions of bzrlib. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
110
110
            if len(revision) == 2:
111
111
                base_revision_id = revision[0].as_revision_id(branch)
112
112
        if revision_id is None:
113
 
            if tree is not None:
114
 
                tree.check_changed_or_out_of_date(
115
 
                    strict, 'send_strict',
116
 
                    more_error='Use --no-strict to force the send.',
117
 
                    more_warning='Uncommitted changes will not be sent.')
 
113
            if strict is None:
 
114
                strict = branch.get_config(
 
115
                    ).get_user_option_as_bool('send_strict')
 
116
            if strict is None: strict = True # default value
 
117
            if strict and tree is not None:
 
118
                if (tree.has_changes()):
 
119
                    raise errors.UncommittedChanges(
 
120
                        tree, more='Use --no-strict to force the send.')
 
121
                if tree.last_revision() != tree.branch.last_revision():
 
122
                    # The tree has lost sync with its branch, there is little
 
123
                    # chance that the user is aware of it but he can still force
 
124
                    # the send with --no-strict
 
125
                    raise errors.OutOfDateTree(
 
126
                        tree, more='Use --no-strict to force the send.')
118
127
            revision_id = branch.last_revision()
119
128
        if revision_id == NULL_REVISION:
120
129
            raise errors.BzrCommandError('No revisions to submit.')