Merge lp:~jelmer/bzr-email/drop-pre-0.15 into lp:bzr-email

[Jelmer Vernooij]

Drop some magic to cope with pre-0.15 versions of bzr.

[John A Meinel (jameinel)]

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

On 2/14/2011 8:14 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-email/drop-pre-0.15 into lp:bzr-email.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-email/drop-pre-0.15/+merge/49628
>
> Drop some magic to cope with pre-0.15 versions of bzr.

If I'm reading the diff correctly, you are completely removing the call
to install the bzr-email post commit hook, without installing it a
different way. Am I missing something? (I'm fine with removing the
getattr stuff in favor of 0.15, but the rest?)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk1ZY2kACgkQJdeBCYSNAAO9pQCeNfIe8Wcqx4qCa0EprBgghA2B
CpAAoNFKEscddEHJjYxcLuFpL1UUr7Qq
=Eaj6
-----END PGP SIGNATURE-----

[Jelmer Vernooij (jelmer)]

> On 2/14/2011 8:14 AM, Jelmer Vernooij wrote:
> > Jelmer Vernooij has proposed merging lp:~jelmer/bzr-email/drop-pre-0.15 into
> lp:bzr-email.
> >
> > Requested reviews:
> > Bazaar Developers (bzr)
> >
> > For more details, see:
> > https://code.launchpad.net/~jelmer/bzr-email/drop-pre-0.15/+merge/49628
> >
> > Drop some magic to cope with pre-0.15 versions of bzr.
>
>
> If I'm reading the diff correctly, you are completely removing the call
> to install the bzr-email post commit hook, without installing it a
> different way. Am I missing something? (I'm fine with removing the
> getattr stuff in favor of 0.15, but the rest?)
The hooks are now installed inline at the bottom of the file, rather than from a function.

Cheers,

jelmer

=== modified file '__init__.py'
--- __init__.py	2010-10-09 23:15:45 +0000
+++ __init__.py	2011-02-14 14:14:25 +0000
@@ -84,8 +84,6 @@
 
 def post_commit(branch, revision_id):
     """This is the post_commit hook that should get run after commit."""
-    if not use_legacy:
-        return
     _emailer.EmailSender(branch, revision_id, branch.get_config()).send_maybe()
 
 
@@ -102,20 +100,6 @@
         params.branch.get_config(), local_branch=None, op='change').send_maybe()
 
 
-def install_hooks():
-    """Install CommitSender to send after commits with bzr >= 0.15 """
-    install_named_hook = getattr(Branch.hooks, 'install_named_hook', None)
-    if install_named_hook is not None:
-        install_named_hook('post_commit', branch_commit_hook, 'bzr-email')
-        if 'post_change_branch_tip' in Branch.hooks:
-            install_named_hook('post_change_branch_tip',
-                branch_post_change_hook, 'bzr-email')
-    else:
-        Branch.hooks.install_hook('post_commit', branch_commit_hook)
-        if getattr(Branch.hooks, 'name_hook', None) is not None:
-            Branch.hooks.name_hook(branch_commit_hook, "bzr-email")
-
-
 def test_suite():
     from unittest import TestSuite
     import bzrlib.plugins.email.tests
@@ -124,13 +108,6 @@
     return result
 
 
-# setup the email plugin with > 0.15 hooks.
-try:
-    install_hooks()
-    use_legacy = False
-except AttributeError:
-    # bzr < 0.15 - no Branch.hooks
-    use_legacy = True
-except errors.UnknownHook:
-    # bzr 0.15 dev before post_commit was added
-    use_legacy = True
+Branch.hooks.install_named_hook('post_commit', branch_commit_hook, 'bzr-email')
+Branch.hooks.install_named_hook('post_change_branch_tip', branch_post_change_hook,
+    'bzr-email')