Merge lp:~johnf-inodes/bzr-email/server_support into lp:bzr-email

[John Ferlito]

[John Ferlito (johnf-inodes)]

Two patches

* The first detects if bzr is running in server mode and send emails on a change rather than a commit

* The second is similar and sets the email from address to the commiter of the revision

[Robert Collins (lifeless)]

We should perhaps always use a set from address, rather than claiming to the person that wrote it, at least for the body.

I'm not sure why this is needed though: the post_commit_push_pull setting was intended to manage this; I have a concern that autodetecting 'on server side' will interact badly with 'ssh server; commit-something-locally', when that has a checkout from the same machine. Can you tell me more about how this is deployed for you?

review: Needs Information

[Jelmer Vernooij (jelmer)]

John, ping?

[John Ferlito (johnf-inodes)]

So we aren't using this any more and I really can't remember. But my vague recollection is we were running the smart server and I wanted all the configuration on that end, to enforce the messages being sent rather than on the client side.

From memory I think that commits worked fine but maybe merge's didn't.

Unmerged revisions

41. By John Ferlito on 2009-03-03

If we are a server use the committers from address rather than our own

40. By John Ferlito on 2009-03-03

Support running in serve mode

When running in serve mode the server sees a commit as a push. Deal with this
and send emails appropriately.

=== modified file '__init__.py'
--- __init__.py	2008-12-09 20:09:15 +0000
+++ __init__.py	2009-03-03 07:24:15 +0000
@@ -70,6 +70,7 @@
 # These three are used during import: No point lazy_importing them.
 from bzrlib import errors
 from bzrlib.branch import Branch
+from bzrlib.smart.server import SmartTCPServer
 from bzrlib.lazy_import import lazy_import
 
 # lazy_import emailer so that it doesn't get loaded if it isn't used
@@ -97,6 +98,8 @@
     _emailer.EmailSender(params.branch, params.new_revid,
         params.branch.get_config(), local_branch=None, op='change').send_maybe()
 
+def server_started_hook(backing_urls, public_urls):
+    _emailer.EmailSender.server_mode = True
 
 def install_hooks():
     """Install CommitSender to send after commits with bzr >= 0.15 """
@@ -111,6 +114,12 @@
         if getattr(Branch.hooks, 'name_hook', None) is not None:
             Branch.hooks.name_hook(branch_commit_hook, "bzr-email")
 
+    install_named_hook = getattr(SmartTCPServer.hooks, 'install_named_hook', None)
+    if install_named_hook is not None:
+        if 'server_started' in SmartTCPServer.hooks:
+            install_named_hook('server_started', server_started_hook,
+                'bzr-email')
+
 
 def test_suite():
     from unittest import TestSuite

=== modified file 'emailer.py'
--- emailer.py	2008-12-09 20:09:15 +0000
+++ emailer.py	2009-03-03 09:05:30 +0000
@@ -29,6 +29,7 @@
     """An email message sender."""
 
     _smtplib_implementation = SMTPConnection
+    server_mode = False
 
     def __init__(self, branch, revision_id, config, local_branch=None,
         op='commit'):
@@ -42,6 +43,7 @@
         self.revision = None
         self.revno = None
         self.op = op
+        self.server_mode = EmailSender.server_mode
 
     def _setup_revision_and_revno(self):
         self.revision = self.repository.get_revision(self._revision_id)
@@ -164,7 +166,10 @@
         """What address should I send from."""
         result = self.config.get_user_option('post_commit_sender')
         if result is None:
-            result = self.config.username()
+            if self.server_mode and self.revision is not None:
+                result = self.revision.committer
+            else:
+                result = self.config.username()
         return result
 
     def send(self):
@@ -235,10 +240,10 @@
         result = self.config.get_user_option('post_commit_difflimit')
         post_commit_push_pull = self.config.get_user_option(
             'post_commit_push_pull') == 'True'
-        if post_commit_push_pull and self.op == 'commit':
+        if (post_commit_push_pull or self.server_mode) and self.op == 'commit':
             # We will be called again with a push op, send the mail then.
             return False
-        if not post_commit_push_pull and self.op != 'commit':
+        if not post_commit_push_pull and not self.server_mode and self.op != 'commit':
             # Mailing on commit only, and this is a push/pull operation.
             return False
         return bool(self.to() and self.from_address())