Rev 3988: Improve error msg when no mail-to address given (Daniel Watkins) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3988
revision-id: pqm at pqm.ubuntu.com-20090209040048-4w0lmgdasmdw5xdn
parent: pqm at pqm.ubuntu.com-20090209023502-xwfb7x9jw7h8oqa7
parent: ian.clatworthy at canonical.com-20090209025657-sj5fjv4yjjv9lb1i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-02-09 04:00:48 +0000
message:
  Improve error msg when no mail-to address given (Daniel Watkins)
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 3986.1.2
    revision-id: ian.clatworthy at canonical.com-20090209025657-sj5fjv4yjjv9lb1i
    parent: ian.clatworthy at canonical.com-20090209020148-eqvqjodqibnoum5q
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Mon 2009-02-09 12:56:57 +1000
    message:
      tweak regex pattern in send test
    modified:
      bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 3986.1.1
    revision-id: ian.clatworthy at canonical.com-20090209020148-eqvqjodqibnoum5q
    parent: pqm at pqm.ubuntu.com-20090209014051-5mj66o1vx58glvs9
    parent: daniel at daniel-watkins.co.uk-20090208133130-8r5225mspte7ypwv
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Mon 2009-02-09 12:01:48 +1000
    message:
      Improve error msg when no mail-to address given (Daniel Watkins)
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
    ------------------------------------------------------------
    revno: 3984.2.1
    revision-id: daniel at daniel-watkins.co.uk-20090208133130-8r5225mspte7ypwv
    parent: pqm at pqm.ubuntu.com-20090205215322-dlhyepy2fid5i7w6
    committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
    branch nick: 198418-send-error-msg
    timestamp: Sun 2009-02-08 14:31:30 +0100
    message:
      Fixed #198418
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2009-01-27 05:04:43 +0000
+++ b/bzrlib/errors.py	2009-02-08 13:31:30 +0000
@@ -2658,7 +2658,7 @@
 
 class NoMailAddressSpecified(BzrError):
 
-    _fmt = "No mail-to address specified."
+    _fmt = "No mail-to address (--mail-to) or output (-o) specified."
 
 
 class UnknownMailClient(BzrError):

=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- a/bzrlib/tests/blackbox/test_send.py	2008-10-30 09:41:51 +0000
+++ b/bzrlib/tests/blackbox/test_send.py	2009-02-09 02:56:57 +0000
@@ -199,7 +199,9 @@
         self.make_trees()
         branch = _mod_branch.Branch.open('branch')
         branch.get_config().set_user_option('mail_client', 'editor')
-        self.run_bzr_error(('No mail-to address specified',), 'send -f branch')
+        self.run_bzr_error(
+            ('No mail-to address \\(--mail-to\\) or output \\(-o\\) specified',
+            ), 'send -f branch')
         branch.get_config().set_user_option('mail_client', 'bogus')
         self.run_bzr('send -f branch -o-')
         self.run_bzr_error(('Unknown mail client: bogus',),