~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-22 14:18:17 UTC
  • mto: (5190.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100422141817-izoao20264ivkauo
Explain that the uncommitted changes are not processed when
issuing the warning.

* bzrlib/mutabletree.py:
(MutableTree.check_changed_or_out_of_date): Use diferent 'more'
arguments depending on whether we issue a warning or an error.

* bzrlib/send.py:
(send): Add the more_warnings argument when calling
check_changed_or_out_of_date.

* bzrlib/foreign.py:
(cmd_dpush.run): Add the more_warnings argument when calling
check_changed_or_out_of_date.

* bzrlib/builtins.py:
(cmd_push.run): Add the more_warnings argument when calling
check_changed_or_out_of_date.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1134
1134
        else:
1135
1135
            revision_id = None
1136
1136
        if tree is not None and revision_id is None:
1137
 
            tree.warn_if_changed_or_out_of_date(
1138
 
                strict, 'push_strict', 'Use --no-strict to force the push.')
 
1137
            tree.check_changed_or_out_of_date(
 
1138
                strict, 'push_strict',
 
1139
                more_error='Use --no-strict to force the push.',
 
1140
                more_warning='Uncommitted changes will not be pushed.')
1139
1141
        # Get the stacked_on branch, if any
1140
1142
        if stacked_on is not None:
1141
1143
            stacked_on = urlutils.normalize_url(stacked_on)