Rev 4477: Mention --no-strict in the error messages for send. in file:///home/vila/src/bzr/bugs/206577-send-strict/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/206577-send-strict/

------------------------------------------------------------
revno: 4477
revision-id: v.ladeuil+lp at free.fr-20090701090258-pb7lsrdfmptc8s08
parent: v.ladeuil+lp at free.fr-20090701083812-9p6w0aim50nk22em
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 206577-send-strict
timestamp: Wed 2009-07-01 11:02:58 +0200
message:
  Mention --no-strict in the error messages for send.
  
  * bzrlib/send.py:
  (send): Add details to the error messages.
-------------- next part --------------
=== modified file 'bzrlib/send.py'
--- a/bzrlib/send.py	2009-07-01 07:20:36 +0000
+++ b/bzrlib/send.py	2009-07-01 09:02:58 +0000
@@ -121,13 +121,14 @@
             if tree is not None and (strict is None or strict):
                 changes = tree.changes_from(tree.basis_tree())
                 if changes.has_changed() or len(tree.get_parent_ids()) > 1:
-                    raise errors.UncommittedChanges(tree)
+                    raise errors.UncommittedChanges(
+                        tree, more='Use --no-strict to force the push.')
                 if tree.last_revision() != tree.branch.last_revision():
                     # The tree has lost sync with its branch, there is little
                     # chance that the user is aware of it but he can still force
                     # the push with --no-strict
-                    raise errors.OutOfDateTree(tree)
-#                        tree, more='Use --no-strict to force the push.',)
+                    raise errors.OutOfDateTree(
+                        tree, more='Use --no-strict to force the push.')
             revision_id = branch.last_revision()
         if revision_id == NULL_REVISION:
             raise errors.BzrCommandError('No revisions to submit.')