2 messages to emacs-diffs per each commit?

2 messages to emacs-diffs per each commit?

[Eli Zaretskii]

It looks like every commit causes two messages sent to emacs-diffs.
One says something like "branch emacs-24 updated (d4fceca ->
1fb97e7)", the other is the actual diffs for the commit.

Why is that?  If this is redundant, can we fix it?

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

I would much prefer to only get one mail in such cases.

Also, the Mail-Followup-To header is wrong. It should be emacs-devel,
not emacs-diffs. (Ideally, it would also include committer, as it used to
do with bzr.)

I'd also like to lose some of the boilerplate text.

IMO we (emacs-devel) need to decide what changes we would like to see to
these mails, then ask Savannah what is possible; so we don't keep
pestering them with repeated requests.

Re: 2 messages to emacs-diffs per each commit?

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Sat, 15 Nov 2014 14:51:11 -0500
> Cc: emacs-devel@gnu.org
> 
> IMO we (emacs-devel) need to decide what changes we would like to see to
> these mails

Can you come up with a proposal, please?

Re: 2 messages to emacs-diffs per each commit?

[Stefan Monnier]

> It looks like every commit causes two messages sent to emacs-diffs.

AFAIK it's one email per commit plus one email per push.
Maybe we could drop all the "email per push".


        Stefan

Re: 2 messages to emacs-diffs per each commit?

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sat, 15 Nov 2014 22:57:01 -0500
> 
> > It looks like every commit causes two messages sent to emacs-diffs.
> 
> AFAIK it's one email per commit plus one email per push.
> Maybe we could drop all the "email per push".

Yes, please, let's drop the "push" emails.

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

I told myself I wouldn't get involved, but I failed. I changed
the Mail-Followup-To, and set multimailhook.refchangeList = ''.
We'll see what that last setting does to the number of emails.

See README at https://github.com/mhagger/git-multimail

Re: 2 messages to emacs-diffs per each commit?

[Stephen Berman]

On Sun, 16 Nov 2014 21:04:03 -0500 Glenn Morris <rgm@gnu.org> wrote:

> I told myself I wouldn't get involved, but I failed. I changed
> the Mail-Followup-To, and set multimailhook.refchangeList = ''.
> We'll see what that last setting does to the number of emails.

It shortens the number as desired.  However, the Subject of the commit
mails does not give the branch, which the Subject of the push mails did.
Here is what the last nine mails looks like in my current Gnus Summary
buffer, the first five before your change, the last four after it:

 . (  28) Lars Ingebrigtsen    │ ▶ [emacs] branch master updated (c94988
 . ( 226) Lars Ingebrigtsen    │ ├─▸ ...[emacs] 01/02: Implement an `inh
 . (  64) Lars Ingebrigtsen    │ ╰─▸ ...[emacs] 02/02: Make the eww buff
 . (  28) Paul Eggert          │ ▶ [emacs] branch emacs-24 updated (cf10
 . ( 244) Paul Eggert          │ ╰─▸ ...[emacs] 01/01: Simplify and fix 
 . (  48) Paul Eggert          │ [emacs] 01/01: Restore 'Bug#' -> 'debbu
 . (1511) Paul Eggert          │ [emacs] 01/01: Improve time stamp handl
 . ( 319) Paul Eggert          │ [emacs] 01/01: Spelling fixes.
 . ( 102) Paul Eggert          │ [emacs] 01/01: Port new time stamp hand

For the last four it would be nice if they looked like this:

 . (  48) Paul Eggert          │ [emacs-24] 01/01: Restore 'Bug#' -> 'de
 . (1511) Paul Eggert          │ [master] 01/01: Improve time stamp hand
 . ( 319) Paul Eggert          │ [master] 01/01: Spelling fixes.
 . ( 102) Paul Eggert          │ [master] 01/01: Port new time stamp han

Another wish list item, unrelated to this particular issue but related
to the presentation of the diff mails, is to have the diffs suitably
MIME'd, like the bzr diffs were, so they get nicely fontified (at least
in Gnus), which makes it easier to quickly see the changes.

Steve Berman

Re: 2 messages to emacs-diffs per each commit?

[Andreas Schwab]

Stephen Berman <stephen.berman@gmx.net> writes:

> Another wish list item, unrelated to this particular issue but related
> to the presentation of the diff mails, is to have the diffs suitably
> MIME'd, like the bzr diffs were, so they get nicely fontified (at least
> in Gnus), which makes it easier to quickly see the changes.

They also use the wrong encoding for the From: line, see Message-ID:
<E1Xq6vI-00079V-Mc@vcs.savannah.gnu.org> for example.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Andreas Schwab wrote:

> They also use the wrong encoding for the From: line, see Message-ID:
> <E1Xq6vI-00079V-Mc@vcs.savannah.gnu.org> for example.

Please check for upstream bug reports on this issue, and see if there is
a patch or an update or a workaround or a setting.

Re: 2 messages to emacs-diffs per each commit?

[Andreas Schwab]

Glenn Morris <rgm@gnu.org> writes:

> Andreas Schwab wrote:
>
>> They also use the wrong encoding for the From: line, see Message-ID:
>> <E1Xq6vI-00079V-Mc@vcs.savannah.gnu.org> for example.
>
> Please check for upstream bug reports on this issue, and see if there is
> a patch or an update or a workaround or a setting.

https://github.com/mhagger/git-multimail/commit/80048c5cf91dff45baf6e21cb4ded5666756bfd1

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: 2 messages to emacs-diffs per each commit?

[Andreas Schwab]

Andreas Schwab <schwab@suse.de> writes:

> Glenn Morris <rgm@gnu.org> writes:
>
>> Andreas Schwab wrote:
>>
>>> They also use the wrong encoding for the From: line, see Message-ID:
>>> <E1Xq6vI-00079V-Mc@vcs.savannah.gnu.org> for example.
>>
>> Please check for upstream bug reports on this issue, and see if there is
>> a patch or an update or a workaround or a setting.
>
> https://github.com/mhagger/git-multimail/commit/80048c5cf91dff45baf6e21cb4ded5666756bfd1

On top of https://github.com/mhagger/git-multimail/commit/94e9854dbd3d595624b18d3c0657cbc8044aa3a6

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Andreas Schwab wrote:

>> https://github.com/mhagger/git-multimail/commit/80048c5cf91dff45baf6e21cb4ded5666756bfd1
>
> On top of https://github.com/mhagger/git-multimail/commit/94e9854dbd3d595624b18d3c0657cbc8044aa3a6

Savannah uses 2c0f21dcb095d7a053660e79627ce67fc342f5ea, which
already includes both those commits.

Re: 2 messages to emacs-diffs per each commit?

[Andreas Schwab]

Glenn Morris <rgm@gnu.org> writes:

> Andreas Schwab wrote:
>
>>> https://github.com/mhagger/git-multimail/commit/80048c5cf91dff45baf6e21cb4ded5666756bfd1
>>
>> On top of https://github.com/mhagger/git-multimail/commit/94e9854dbd3d595624b18d3c0657cbc8044aa3a6
>
> Savannah uses 2c0f21dcb095d7a053660e79627ce67fc342f5ea, which
> already includes both those commits.

But only since today.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Andreas Schwab wrote:

>> Savannah uses 2c0f21dcb095d7a053660e79627ce67fc342f5ea, which
>> already includes both those commits.
>
> But only since today.

No. It was using that version since ~ January.
As of today it uses the very latest version.
But there don't seem to be any relevant changes.

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Stephen Berman wrote:

> It shortens the number as desired.  However, the Subject of the commit
> mails does not give the branch, which the Subject of the push mails did.

Please test it out with a local repo and see if there is a config or
a patch to do that.

> Another wish list item, unrelated to this particular issue but related
> to the presentation of the diff mails, is to have the diffs suitably
> MIME'd, like the bzr diffs were, so they get nicely fontified (at least
> in Gnus), which makes it easier to quickly see the changes.

Please check for upstream bug reports on this and see if there is a
patch or a setting or a whatever.

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Glenn Morris wrote:

> set multimailhook.refchangeList = ''.

As I suspected might happen, this apparently broke threading for pushes
that include > 1 commit. Looks like we need the
"fewer-emails-if-single-commit-pushed" branch from
https://github.com/mhagger/git-multimail/ .

I don't know how finished this is.

If someone wants to test that out and report back, that would be nice.

Ref:
https://github.com/mhagger/git-multimail/issues/32
https://github.com/mhagger/git-multimail/pull/51

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Glenn Morris wrote:

> "fewer-emails-if-single-commit-pushed" branch from

Seems to work, installed.
Also added branch to the subject.

Re: 2 messages to emacs-diffs per each commit?

[Stephen Berman]

On Tue, 18 Nov 2014 03:02:45 -0500 Glenn Morris <rgm@gnu.org> wrote:

> Also added branch to the subject.

Thanks.  I'll try to follow up on the diff fontification issue when I
have time.

Steve Berman

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

Stephen Berman wrote:

> Thanks.  I'll try to follow up on the diff fontification issue when I
> have time.

I filed
https://github.com/mhagger/git-multimail/issues/69

but to me the project shows signs of having stalled (no activity in six
months).

Re: 2 messages to emacs-diffs per each commit?

[Stephen Berman]

On Tue, 18 Nov 2014 12:00:20 -0500 Glenn Morris <rgm@gnu.org> wrote:

> Stephen Berman wrote:
>
>> Thanks.  I'll try to follow up on the diff fontification issue when I
>> have time.
>
> I filed
> https://github.com/mhagger/git-multimail/issues/69

Thanks.

> but to me the project shows signs of having stalled (no activity in six
> months).

Hmm, that sounds somehow familiar.  Bizarre...

Steve Berman

Re: 2 messages to emacs-diffs per each commit?

[Glenn Morris]

BTW, since Lars went ahead and pushed his feature branch, everyone now
gets all the diffs for that too, since there is no way to restrict this
thing to specific branches.

https://github.com/mhagger/git-multimail/pull/15

(stalled for over a year)

Re: 2 messages to emacs-diffs per each commit?

[Stefan Monnier]

> BTW, since Lars went ahead and pushed his feature branch, everyone now
> gets all the diffs for that too, since there is no way to restrict this
> thing to specific branches.

FWIW, this is exactly what we need for elpa.git and I think it's also OK
for emacs.git.


        Stefan

Re: 2 messages to emacs-diffs per each commit?

[Johan Bockgård]

Stephen Berman <stephen.berman@gmx.net> writes:

> On Tue, 18 Nov 2014 03:02:45 -0500 Glenn Morris <rgm@gnu.org> wrote:
>
>> Also added branch to the subject.
>
> Thanks.  I'll try to follow up on the diff fontification issue when I
> have time.

Meanwhile, try this in your .gnus

    (require 'mm-uu)
    ;; Replace the default specification for git-format-patch which
    ;; doesn't seem so useful.
    (setcdr (assq 'git-format-patch mm-uu-type-alist)
            `("^diff --git " ""
               mm-uu-diff-extract
               ,(lambda ()
                  (re-search-forward "^--- " nil t)
                  (re-search-forward "^[^-+@ ]\\|\\'" nil t)
                  (forward-line -2))
               mm-uu-diff-test))
    (mm-uu-configure)

Adjust mm-uu-diff-groups-regexp if needed.

Re: 2 messages to emacs-diffs per each commit?

[Stephen Berman]

On Tue, 25 Nov 2014 23:36:23 +0100 Johan Bockgård <bojohan@gnu.org> wrote:

> Stephen Berman <stephen.berman@gmx.net> writes:
>
>> On Tue, 18 Nov 2014 03:02:45 -0500 Glenn Morris <rgm@gnu.org> wrote:
>>
>>> Also added branch to the subject.
>>
>> Thanks.  I'll try to follow up on the diff fontification issue when I
>> have time.
>
> Meanwhile, try this in your .gnus
>
>     (require 'mm-uu)
>     ;; Replace the default specification for git-format-patch which
>     ;; doesn't seem so useful.
>     (setcdr (assq 'git-format-patch mm-uu-type-alist)
>             `("^diff --git " ""
>                mm-uu-diff-extract
>                ,(lambda ()
>                   (re-search-forward "^--- " nil t)
>                   (re-search-forward "^[^-+@ ]\\|\\'" nil t)
>                   (forward-line -2))
>                mm-uu-diff-test))
>     (mm-uu-configure)
>
> Adjust mm-uu-diff-groups-regexp if needed.

Very nice, thanks!

Steve Berman

Re: 2 messages to emacs-diffs per each commit?

[Ted Zlatanov]

On Tue, 18 Nov 2014 03:02:45 -0500 Glenn Morris <rgm@gnu.org> wrote: 

GM> Glenn Morris wrote:
>> "fewer-emails-if-single-commit-pushed" branch from

GM> Seems to work, installed.
GM> Also added branch to the subject.

Thanks!  I was just about to ask for that :)

Ted