Merge lp:~danigm/bzr-email/branch-commit-to into lp:bzr-email

[danigm]

[danigm (danigm)]

Post commit to per repository

[Robert Collins (lifeless)]

Hi, thanks for this merge proposal.

I don't understand why all this is needed, and you proposal doesn't
explain either. There are a number of structural issues, such as using
GlobalConfig directly, and using private variables, which I can't assess
until I know the reason for the changes.

Could you please explain in more detail what was wrong that you needed
to change to make things work.

Thanks,
Rob

 review: needsinfo

review: Needs Information

[danigm (danigm)]

> Hi, thanks for this merge proposal.
>
> I don't understand why all this is needed, and you proposal doesn't
> explain either. There are a number of structural issues, such as using
> GlobalConfig directly, and using private variables, which I can't assess
> until I know the reason for the changes.
>
> Could you please explain in more detail what was wrong that you needed
> to change to make things work.
>

When I use bazaar in my computer I have a lot of branch of a lot of projects. And if I set post_commit_to to an email, all branches send an email when I do commit, and I only want to send to different email accounts depending on wich branch I'm working.

This branch add the option to configure a post_commit_to for each branch in your machine.

I think that this resolve that bug #309560

[Robert Collins (lifeless)]

On Thu, 2009-12-03 at 08:55 +0000, danigm wrote:
> > Hi, thanks for this merge proposal.
> >
> > I don't understand why all this is needed, and you proposal doesn't
> > explain either. There are a number of structural issues, such as using
> > GlobalConfig directly, and using private variables, which I can't assess
> > until I know the reason for the changes.
> >
> > Could you please explain in more detail what was wrong that you needed
> > to change to make things work.
> >
>
> When I use bazaar in my computer I have a lot of branch of a lot of projects. And if I set post_commit_to to an email, all branches send an email when I do commit, and I only want to send to different email accounts depending on wich branch I'm working.
>
> This branch add the option to configure a post_commit_to for each branch in your machine.
>
> I think that this resolve that bug #309560

You should already be able to do that in branch.conf, are you saying
that that doesn't work?

-Rob

[danigm (danigm)]

> On Thu, 2009-12-03 at 08:55 +0000, danigm wrote:
> > > Hi, thanks for this merge proposal.
> > >
> > > I don't understand why all this is needed, and you proposal doesn't
> > > explain either. There are a number of structural issues, such as using
> > > GlobalConfig directly, and using private variables, which I can't assess
> > > until I know the reason for the changes.
> > >
> > > Could you please explain in more detail what was wrong that you needed
> > > to change to make things work.
> > >
> >
> > When I use bazaar in my computer I have a lot of branch of a lot of
> projects. And if I set post_commit_to to an email, all branches send an email
> when I do commit, and I only want to send to different email accounts
> depending on wich branch I'm working.
> >
> > This branch add the option to configure a post_commit_to for each branch in
> your machine.
> >
> > I think that this resolve that bug #309560
>
> You should already be able to do that in branch.conf, are you saying
> that that doesn't work?
>
> -Rob

mmm... ok, that isn't documented... or it's... anyway I don't know nothing about branch.conf, I need to read about it. Today I learn something new.

Sorry, then this branch has no sense, and bug report is invalid too.

Thanks.

[Jelmer Vernooij (jelmer)]

> > On Thu, 2009-12-03 at 08:55 +0000, danigm wrote:
> > > > Hi, thanks for this merge proposal.
> > > >
> > > > I don't understand why all this is needed, and you proposal doesn't
> > > > explain either. There are a number of structural issues, such as using
> > > > GlobalConfig directly, and using private variables, which I can't assess
> > > > until I know the reason for the changes.
> > > >
> > > > Could you please explain in more detail what was wrong that you needed
> > > > to change to make things work.
> > > >
> > >
> > > When I use bazaar in my computer I have a lot of branch of a lot of
> > projects. And if I set post_commit_to to an email, all branches send an
> email
> > when I do commit, and I only want to send to different email accounts
> > depending on wich branch I'm working.
> > >
> > > This branch add the option to configure a post_commit_to for each branch
> in
> > your machine.
> > >
> > > I think that this resolve that bug #309560
> >
> > You should already be able to do that in branch.conf, are you saying
> > that that doesn't work?

> mmm... ok, that isn't documented... or it's... anyway I don't know nothing
> about branch.conf, I need to read about it. Today I learn something new.
We should definitely improve the documentation for branch.conf - I agree it's not as clear at the moment as it could be.

Newer versions of bzr have a "bzr config" command which allows you to see and modify all relevant configuration options, both global and per-branch.

> Sorry, then this branch has no sense, and bug report is invalid too.
The bug report is about a repository-specific configuration (rather than a branch-specific configuration, which branch.conf is).

I'll mark this MP as rejected, since it overlaps with functionality we already have.

review: Disapprove (code)

Unmerged revisions

42. By danigm on 2009-12-02

added mailto commad

41. By danigm on 2009-12-02

Configure post_commit_to per repository #309560

=== modified file '__init__.py'
--- __init__.py	2008-12-09 20:09:15 +0000
+++ __init__.py	2009-12-02 10:40:24 +0000
@@ -71,6 +71,10 @@
 from bzrlib import errors
 from bzrlib.branch import Branch
 from bzrlib.lazy_import import lazy_import
+from bzrlib.commands import Command, register_command
+from bzrlib.config import GlobalConfig
+from bzrlib.errors import InvalidURL, BzrCommandError, NotBranchError
+from bzrlib.option import Option
 
 # lazy_import emailer so that it doesn't get loaded if it isn't used
 lazy_import(globals(), """\
@@ -119,6 +123,41 @@
     result.addTest(bzrlib.plugins.email.tests.test_suite())
     return result
 
+class cmd_mailto(Command):
+    """Add, remove or modify a mailto on commit by branch."""
+    
+    _see_also = ["mailto"]
+
+    takes_args = ['email', 'location?']
+    takes_options = [
+        Option('delete', help='Delete this bookmark.'),
+        ]
+
+    def run(self, email=None, location='.', delete=False):
+        self.set_email(email, location)
+        if delete:
+            self.del_email(location)
+
+    def get_url(self, location='.'):
+        self.branch = Branch.open_containing(location)[0]
+        url = "EMAIL:%s" % self.branch.base[7:]
+        return url
+
+    def del_email(self, location):
+        config = GlobalConfig()
+        parser = config._get_parser()
+        url = self.get_url(location)
+        del parser[url]["post_commit_to"]
+        parser.write(file(config._get_filename(), 'wb'))
+
+    def set_email(self, email, location):
+        config = GlobalConfig()
+        parser = config._get_parser()
+        url = self.get_url(location)
+        if url not in parser:
+            parser[url] = {}
+        parser[url]["post_commit_to"] = email
+        parser.write(file(config._get_filename(), 'wb'))
 
 # setup the email plugin with > 0.15 hooks.
 try:
@@ -130,3 +169,5 @@
 except errors.UnknownHook:
     # bzr 0.15 dev before post_commit was added
     use_legacy = True
+
+register_command(cmd_mailto)

=== modified file 'emailer.py'
--- emailer.py	2008-12-09 20:09:15 +0000
+++ emailer.py	2009-12-02 10:40:24 +0000
@@ -16,6 +16,8 @@
 
 import errno
 import subprocess
+from bzrlib.config import GlobalConfig
+
 
 from bzrlib import (
     errors,
@@ -43,6 +45,9 @@
         self.revno = None
         self.op = op
 
+        c = GlobalConfig()
+        self.parser = c._get_parser()
+
     def _setup_revision_and_revno(self):
         self.revision = self.repository.get_revision(self._revision_id)
         self.revno = self.branch.revision_id_to_revno(self._revision_id)
@@ -125,20 +130,28 @@
 
     def difflimit(self):
         """Maximum number of lines of diff to show."""
-        result = self.config.get_user_option('post_commit_difflimit')
-        if result is None:
-            result = 1000
-        return int(result)
+        opt = self.get_custom_opt('post_commit_difflimit')
+        if opt:
+            return opt
+        else:
+            result = self.config.get_user_option('post_commit_difflimit')
+            if result is None:
+                result = 1000
+            return int(result)
 
     def mailer(self):
         """What mail program to use."""
-        result = self.config.get_user_option('post_commit_mailer')
-        if result is None:
-            result = "mail"
-        return result
+        opt = self.get_custom_opt('post_commit_mailer')
+        if opt:
+            return opt
+        else:
+            result = self.config.get_user_option('post_commit_mailer')
+            if result is None:
+                result = "mail"
+            return result
 
     def _command_line(self):
-        cmd = [self.mailer(), '-s', self.subject(), '-a',
+        cmd = [self.mailer(), '-s', self.subject(),
                 "From: " + self.from_address()]
         to = self.to()
         if isinstance(to, basestring):
@@ -147,13 +160,31 @@
             cmd.extend(to)
         return cmd
 
+    def get_custom_opt(self, option):
+        url = "EMAIL:%s" % self.branch.base[7:]
+        if url in self.parser:
+            try:
+                return self.parser[url][option]
+            except:
+                return None
+        else:
+            return None
+
     def to(self):
         """What is the address the mail should go to."""
-        return self.config.get_user_option('post_commit_to')
+        opt = self.get_custom_opt('post_commit_to')
+        if opt:
+            return opt
+        else:
+            return self.config.get_user_option('post_commit_to')
 
     def url(self):
         """What URL to display in the subject of the mail"""
-        url = self.config.get_user_option('post_commit_url')
+        url = self.get_custom_opt('post_commit_url')
+        if url is None:
+            url = self.get_custom_opt('public_branch')
+        if url is None:
+            url = self.config.get_user_option('post_commit_url')
         if url is None:
             url = self.config.get_user_option('public_branch')
         if url is None:
@@ -162,10 +193,14 @@
 
     def from_address(self):
         """What address should I send from."""
-        result = self.config.get_user_option('post_commit_sender')
-        if result is None:
-            result = self.config.username()
-        return result
+        opt = self.get_custom_opt('post_commit_sender')
+        if opt:
+            return opt
+        else:
+            result = self.config.get_user_option('post_commit_sender')
+            if result is None:
+                result = self.config.username()
+            return result
 
     def send(self):
         """Send the email.
@@ -232,18 +267,28 @@
                                             self.diff_filename())
 
     def should_send(self):
-        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':
-            # 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':
-            # Mailing on commit only, and this is a push/pull operation.
-            return False
-        return bool(self.to() and self.from_address())
+        opt = self.get_custom_opt('post_commit_difflimit')
+        if opt:
+            return opt
+        else:
+            opt_push_pull = self.get_custom_opt('post_commit_push_pull')
+            if not opt_push_pull:
+                opt_push_pull = self.config.get_user_option('post_commit_push_pull')
+
+            result = self.config.get_user_option('post_commit_difflimit')
+            post_commit_push_pull = opt_push_pull == 'True'
+            if post_commit_push_pull 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':
+                # Mailing on commit only, and this is a push/pull operation.
+                return False
+            return bool(self.to() and self.from_address())
 
     def send_maybe(self):
+        config = GlobalConfig()
+        parser = config._get_parser()
+
         if self.should_send():
             self.send()