[MERGE] Emacs message mode as email client option

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Bojan Nikolic wrote:
> Aaron, thanks for the detailed comments -- hopefully I have incorporated
> them below.

No problem.  This is almost perfect.  Just needs some trivial changes.

bb:tweak

> I would still like to post this more complete patch even though it uses
> the non-default "message" email facility of emacs. If I'm not mistaken
> this is necessary to allow attaching the bundle as a separate part
> (which will hopefully be demonstrated in this post).

Yes, it looks nice.  It would be even nicer if the attachment had a
filename set.

> === modified file 'NEWS'
> --- NEWS	2008-03-23 23:11:45 +0000
> +++ NEWS	2008-03-25 17:12:40 +0000
> @@ -34,6 +34,10 @@
>      * Diff is now more specific about execute-bit changes it describes
>        (Chad Miller)
>  
> +   * Emacs's message mode is now a supported mail client; set
> +     ``mail_client=emacs-message`` in your bazaar.conf and ``send``
> +     will pop the bundle in a message buffer using emacsclient.

^^^ You should credit yourself and Xavier in the NEWS entry.  See how
the previous entry credits Chad Miller?

> === modified file 'bzrlib/mail_client.py'
> --- bzrlib/mail_client.py	2008-03-16 14:41:10 +0000
> +++ bzrlib/mail_client.py	2008-03-25 17:20:47 +0000
> @@ -305,6 +305,37 @@
>                  self._encode_path(attach_path, 'attachment')])
>          return commandline
>  
> +class EMACSMessageEmail(ExternalMailClient):
> +    
> +    
> +    """Enter the bundle into emacs message-mode mail buffer"""

Sorry if my instructions were confusing: there should be two blank lines
between classes.  There should be no blank lines between a class and its
docstring.

> === modified file 'bzrlib/tests/test_mail_client.py'
> --- bzrlib/tests/test_mail_client.py	2008-03-19 20:13:06 +0000
> +++ bzrlib/tests/test_mail_client.py	2008-03-25 17:20:47 +0000
> @@ -99,6 +99,50 @@
>              self.assertFalse(isinstance(item, unicode),
>                  'Command-line item %r is unicode!' % item)
>  
> +class TestEMACSMessageEmail(tests.TestCase):

Again, two blank lines between classes.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH6TrE0F+nu1YWqI0RAvuQAJ9oYrlycVtC27B8Cf5HPFabRjXLJwCeMTZ4
vZmVPXf7u0B74wODMI7kMWY=
=diJ4
-----END PGP SIGNATURE-----