Rev 32: actually use message_id_from_revision_id in http://bzr.arbash-meinel.com/plugins/email

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/email

------------------------------------------------------------
revno: 32
revision-id: john at arbash-meinel.com-20080318171408-1v4tqgu9d45vhzlm
parent: john at arbash-meinel.com-20080318170912-u01q3u6ue6pt4u1w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: email
timestamp: Tue 2008-03-18 12:14:08 -0500
message:
  actually use message_id_from_revision_id
modified:
  emailer.py                     emailer.py-20070123220937-ec5y2n2oeoa0p4ue-1
  tests/testemail.py             testpublish.py-20051018071212-e3a53d78c05e0e0a
-------------- next part --------------
=== modified file 'emailer.py'
--- a/emailer.py	2008-03-18 17:09:12 +0000
+++ b/emailer.py	2008-03-18 17:14:08 +0000
@@ -207,11 +207,12 @@
                 raise
 
     def message_id(self):
-        return "<%s>" % (self.revision.revision_id,)
+        return message_id_from_revision_id(self.revision.revision_id)
 
     def in_reply_to(self):
         if self.revision.parent_ids:
-            return "<%s>" % (self.revision.parent_ids[0],)
+            parent_id = self.revision.parent_ids[0]
+            return message_id_from_revision_id(parent_id)
         else:
             return None
 

=== modified file 'tests/testemail.py'
--- a/tests/testemail.py	2008-03-18 17:09:12 +0000
+++ b/tests/testemail.py	2008-03-18 17:14:08 +0000
@@ -97,13 +97,13 @@
 
     def test_message_id_and_in_reply_to_no_parents(self):
         sender = self.get_sender()
-        self.assertEqual('<A>', sender.message_id())
+        self.assertEqual('<A at bzr-email>', sender.message_id())
         self.assertIs(None, sender.in_reply_to())
 
     def test_message_and_in_reply_to_one_parent(self):
         sender = self.get_sender_with_two_commits()
-        self.assertEqual('<rev-second>', sender.message_id())
-        self.assertEqual('<rev-first>', sender.in_reply_to())
+        self.assertEqual('<rev-second at bzr-email>', sender.message_id())
+        self.assertEqual('<rev-first at bzr-email>', sender.in_reply_to())
 
     def test_default_should_include_message_id(self):
         sender = self.get_sender()