[PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Daniel Dehennin]

[-- Attachment #1: Type: text/plain, Size: 3151 bytes --]

Hello,

I use a little patch[1] since years to split groups not only on group
parameters from “newsrc” but from “gnus-parameters” too.

I found the later easier to manage.

Following is my pull request, if you want it.

Regards.

The following changes since commit 23c6fe6e28b8b6f356bae60e2fc773c41cd8b540:

  gnus-msg.el (gnus-setup-message): Fix last commit (2013-12-09 00:35:04 +0000)

are available in the git repository at:

  git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

for you to fetch changes up to a0a3183b02ae84a53e266522fbc74d548a7cba00:

  Use `gnus-parameters' in `gnus-group-split-fancy' (2013-12-14 15:10:06 +0100)

----------------------------------------------------------------
Group splitting does not use `gnus-parameters'

I found `gnus-parameters' easier to manage than `newsrc':

- human readable file
- file is versionned

This patch add the `gnus-parameters' to `newsrc' structure before
building split.

----------------------------------------------------------------
Daniel Dehennin (1):
      Use `gnus-parameters' in `gnus-group-split-fancy'

 lisp/gnus-mlspl.el | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index 3947c67..0690a12 100644
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -94,10 +94,24 @@ See `gnus-group-split-fancy' for more information.
     (gnus-group-split-update)
     (nnmail-split-fancy)))
 
+(defun gnus-group-split-prepare-parameters (&optional parameters)
+  "Convert PARAMETERS alist or `gnus-parameters' to a newsrc
+structure usable by `gnus-group-split-fancy'"
+  (let ((group-params (if parameters
+			  parameters
+			gnus-parameters))
+	newsrc-alist)
+    (dolist (param-assoc group-params newsrc-alist)
+      (let ((group (car param-assoc))
+	    (param (cdr param-assoc)))
+	(setq newsrc-alist
+	      (append newsrc-alist (list (list group nil nil nil nil param))))))))
+
 ;;;###autoload
 (defun gnus-group-split-fancy
   (&optional groups no-crosspost catch-all)
-  "Uses information from group parameters in order to split mail.
+  "Uses information from group parameters and `gnus-parameters'
+in order to split mail.
 It can be embedded into `nnmail-split-fancy' lists with the SPLIT
 
 \(: gnus-group-split-fancy GROUPS NO-CROSSPOST CATCH-ALL\)
@@ -146,7 +160,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
       (any \"\\\\(foo@nowhere\\\\.gov\\\\|foo@localhost\\\\|foo-redist@home\\\\)\"
 	   - \"bugs-foo\" - \"rambling-foo\" \"mail.foo\"))
    \"mail.others\")"
-  (let* ((newsrc (cdr gnus-newsrc-alist))
+  (let* ((newsrc (append (cdr gnus-newsrc-alist) (gnus-group-split-prepare-parameters)))
 	 split)
     (dolist (info newsrc)
       (let ((group (gnus-info-group info))


Footnotes: 
[1]  http://git.baby-gnu.net/gitweb/gitweb.cgi?p=gnus.git;a=tag;h=refs/tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF

[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Daniel Dehennin]

[-- Attachment #1: Type: text/plain, Size: 2285 bytes --]

Daniel Dehennin <daniel.dehennin@baby-gnu.org> writes:

> Hello,
>
> I use a little patch[1] since years to split groups not only on group
> parameters from “newsrc” but from “gnus-parameters” too.
>
> I found the later easier to manage.
>
> Following is my pull request, if you want it.

Hello,

I rebase my patch[1] on latest master and use Gnus utility function
“gnus-group-find-parameter” instead of defining a useless new one.

Regards.

Here is my pull request.

The following changes since commit 934f25f8d8801afe315722fd0b0b4ea14bcb1534:

  Make split tracing work in nnimap groups, too (2013-12-26 17:39:39 +0100)

are available in the git repository at:

  git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

for you to fetch changes up to a33cd267a99c690416b290beb3c37a3e65e19a15:

  Use `gnus-parameters' in `gnus-group-split-fancy' (2013-12-28 02:16:11 +0100)

----------------------------------------------------------------
Group splitting does not use “gnus-parameters”

This version of the patch use “gnus-group-find-parameter” to get
parameters from “newsrc” and from “gnus-parameters”.

----------------------------------------------------------------
Daniel Dehennin (1):
      Use `gnus-parameters' in `gnus-group-split-fancy'

 lisp/gnus-mlspl.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index 3947c67..0470e5e 100644
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -149,8 +149,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
   (let* ((newsrc (cdr gnus-newsrc-alist))
 	 split)
     (dolist (info newsrc)
-      (let ((group (gnus-info-group info))
-	    (params (gnus-info-params info)))
+      (let* ((group (gnus-info-group info))
+	     (params (gnus-group-find-parameter group)))
 	;; For all GROUPs that match the specified GROUPS
 	(when (or (not groups)
 		  (and (listp groups)

Footnotes: 
[1]  http://git.baby-gnu.net/gitweb/gitweb.cgi?p=gnus.git;a=tag;h=refs/tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF

[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Daniel Dehennin]

[-- Attachment #1: Type: text/plain, Size: 3972 bytes --]

Hello,

This version of the patch[1] fixes two problems of the previous one:

1. some SPLIT where duplicated because the group name was present in
   “gnus-newsrc-alist” and in “gnus-parameters”

2. using only groups from “gnus-newsrc-alist” avoid creating new ones
   automatically when splitting, now, a user just need to:
   1. add a new entry to “gnus-parameters”
   2. update “nnmail-split-fancy” with “gnus-group-split-update”
   3. subscribe to the new mailing list
   4. the splitting will create the new group automatically when the
      first mail arrives

Regards.

The following changes since commit b4bc300f0dcddc2b17bb50a3501ed6e6db1ef12c:

  Update copyright year to 2014 (2014-01-01 10:39:44 +0000)

are available in the git repository at:

  git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

for you to fetch changes up to b612682b8df60b5b4a2a854639f1cfb6d6fb28a3:

  Use `gnus-parameters' in `gnus-group-split-fancy' (2014-01-02 23:25:17 +0100)

----------------------------------------------------------------
Group splitting does not use “gnus-parameters”

This version of the patch build the list of all unique group names
gathered from “gnus-newsrc-alist” and “gnus-parameters” and then use
“gnus-group-find-parameter” to get each group parameters.

Using only “gnus-newsrc-alist” avoids the automatic creation of new
group during splitting when only “gnus-parameters” is configured.

Filter the groups during the build of group names, this avoid
calculation if user pass a list of group names.

----------------------------------------------------------------
Daniel Dehennin (1):
      Use `gnus-parameters' in `gnus-group-split-fancy'

 lisp/gnus-mlspl.el | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/lisp/gnus-mlspl.el b/lisp/gnus-mlspl.el
index 8dec6f2..2d86d0b 100644
--- a/lisp/gnus-mlspl.el
+++ b/lisp/gnus-mlspl.el
@@ -146,20 +146,27 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
       (any \"\\\\(foo@nowhere\\\\.gov\\\\|foo@localhost\\\\|foo-redist@home\\\\)\"
 	   - \"bugs-foo\" - \"rambling-foo\" \"mail.foo\"))
    \"mail.others\")"
-  (let* ((newsrc (cdr gnus-newsrc-alist))
-	 split)
-    (dolist (info newsrc)
-      (let ((group (gnus-info-group info))
-	    (params (gnus-info-params info)))
-	;; For all GROUPs that match the specified GROUPS
-	(when (or (not groups)
-		  (and (listp groups)
-		       (memq group groups))
-		  (and (stringp groups)
-		       (string-match groups group)))
-	  (let ((split-spec (assoc 'split-spec params)) group-clean)
-	    ;; Remove backend from group name
-	    (setq group-clean (string-match ":" group))
+  (let ((group-names (if (and (listp groups)
+                             (not (null groups)))
+			 groups
+		       (delete-dups
+			(delq nil
+			      (mapcar
+			       (lambda (info)
+				 (let ((group (gnus-info-group info)))
+				   (if (or (not groups)
+					   (and (stringp groups)
+						(string-match groups group)))
+				       group)))
+			       (append gnus-newsrc-alist gnus-parameters))))))
+       split)
+    (dolist (group group-names)
+      (let ((params (gnus-group-find-parameter group)))
+       ;; Skip groups without param (or nonexistent)
+       (when (not (null params))
+         (let ((split-spec (assoc 'split-spec params)) group-clean)
+           ;; Remove backend from group name
+           (setq group-clean (string-match ":" group))
 	    (setq group-clean
 		  (if group-clean
 		      (substring group (1+ group-clean))


Footnotes: 
[1]  http://git.baby-gnu.net/gitweb/gitweb.cgi?p=gnus.git;a=tag;h=refs/tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF

[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Steinar Bang]

>>>>> Daniel Dehennin <daniel.dehennin@baby-gnu.org>:

> The following changes since commit b4bc300f0dcddc2b17bb50a3501ed6e6db1ef12c:

>   Update copyright year to 2014 (2014-01-01 10:39:44 +0000)

> are available in the git repository at:

>   git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

HOWTO for adding these to gnus master:
 - Enter your git gnus clone
    cd ~/git/gnus
 - Add and fetch the baby-gnu gnus repo
    git remote add baby-gnu git://git.baby-gnu.net/gnus.git
    git fetch --tags baby-gnu
    git fetch baby-gnu
 - Update the gnus master branch to HEAD
    git checkout master
    git pull
 - Merge in the tag, and stop for inspection (magit is nice for looking
   at the merge results after this step, and also for fixing merge
   conflicts): 
    git merge --no-ff --no-commit feature/use-gnus-parameters-in-gnus-group-split-fancy
 - After inspection and fix, either `c' to commit from inside magit, or
   commit on the command line:
    git commit

The difference to doing this as opposed to applying the patch, is that
you could potentially get the full history of the change with multiple
commits (in this case this was just a single commit).

If one decide to revert the commit, just do a:
 git checkout master
 git reset --hard origin/master
(the extra checkout is to be doubly sure I am on the right branch before
doing the hard reset)

(For those that hasn't used git yet: the reason this works is git's
storage-by-content approach, that means that a commit with the same
changes and the same metadata is seen as the same commit no matter where
it comes from. Ie. a merge with the master on baby-gnu into master from
gnus.org will only see a difference for commits that have been added on
baby-gnu)

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Daniel Dehennin]

[-- Attachment #1: Type: text/plain, Size: 1796 bytes --]

Steinar Bang <sb@dod.no> writes:

[...]

> HOWTO for adding these to gnus master:
>  - Enter your git gnus clone
>     cd ~/git/gnus
>  - Add and fetch the baby-gnu gnus repo
>     git remote add baby-gnu git://git.baby-gnu.net/gnus.git
>     git fetch --tags baby-gnu
>     git fetch baby-gnu
>  - Update the gnus master branch to HEAD
>     git checkout master
>     git pull
>  - Merge in the tag, and stop for inspection (magit is nice for looking
>    at the merge results after this step, and also for fixing merge
>    conflicts): 
>     git merge --no-ff --no-commit feature/use-gnus-parameters-in-gnus-group-split-fancy
>  - After inspection and fix, either `c' to commit from inside magit, or
>    commit on the command line:
>     git commit

Hello,

When I need to make a merge for an occasional patch like this one, I'm
doing quite differently, I do not add the remote:

- I update the branch where the merge will go:
    git checkout master && git pull

- If I'm feeling paranoid, I create a dedicated branch to test the
  merge:
    git checkout -b i master

- I just merge the tag with information given in the pull request:
    git pull git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy

- In case of paranoid:
  + I edit the merge message to replace “i” by the real branch where I
    want to merge
  + I merge the “i” branch in master, If I'm not happy with the merge, I
    just trash the branch and ask for a reworked patch

- In non-paranoid case, if I'm not happy with the merge, I just reset
  it (by resetting to “upstream” state):
    git reset --hard @{u}
  
Regards.
-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF

[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Steinar Bang]

>>>>> Daniel Dehennin <daniel.dehennin@baby-gnu.org>:

> When I need to make a merge for an occasional patch like this one, I'm
> doing quite differently, I do not add the remote:

FWIW that seems an awful lot of work, and if one is that paranoid,
perhaps one shouldn't be merging the fix in the first place...

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Daniel Dehennin]

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

Steinar Bang <sb@dod.no> writes:


[...]

> FWIW that seems an awful lot of work, and if one is that paranoid,
> perhaps one shouldn't be merging the fix in the first place...

I should have missed something in my explanation, the paranoid part is
optional, I mostly do the pull directly in master:

- pull master to be up-to-date against origin
- pull the remote tag in master
- if I do not like, juste “git reset --hard to HEAD~”

Regards.

-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF

[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Steinar Bang]

>>>>> Daniel Dehennin <daniel.dehennin@baby-gnu.org>:

> I should have missed something in my explanation, the paranoid part is
> optional,

Right! :-)

> I mostly do the pull directly in master:

> - pull master to be up-to-date against origin
> - pull the remote tag in master
> - if I do not like, juste “git reset --hard to HEAD~”

Which is simple and straightforward.

(On a side note I've found it useful to add actual copy/pastable
commands with all such instructions. That increases the likelyhood of
people actually following the instructions (I know the actual
instructions are two messages earlier in the thread, but people will not
necessarily go there, or if they do, spend time figuring out which of
those commands are the ones you list above). Git has so many
possibilities, it is best learnt "by absorption"... or at least: use it
a lot, then read the "Pro git" book)

My personal preference is to just leave the other remote hanging
around.  It does no harm, and I can study the branches there if I should
feel the urge.

I also prefer to work with branches, and almost(*) exclusively using
merge.

(*) I rebase/cherry-pick when taking changes back to old branches, and
    when I've messed up a "fake merge", and git insists that it won't
    merge because the target branch is alreayd up to date...

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Lars Ingebrigtsen]

Daniel Dehennin <daniel.dehennin@baby-gnu.org> writes:

> This version of the patch[1] fixes two problems of the previous one:
>
> 1. some SPLIT where duplicated because the group name was present in
>    “gnus-newsrc-alist” and in “gnus-parameters”
>
> 2. using only groups from “gnus-newsrc-alist” avoid creating new ones
>    automatically when splitting, now, a user just need to:
>    1. add a new entry to “gnus-parameters”
>    2. update “nnmail-split-fancy” with “gnus-group-split-update”
>    3. subscribe to the new mailing list
>    4. the splitting will create the new group automatically when the
>       first mail arrives

Thanks; I've now applied this to Ma Gnus 0.10.  Perhaps something needs
to be documented in the manual, too?

-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Daniel Dehennin]

[-- Attachment #1: Type: text/plain, Size: 1159 bytes --]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Daniel Dehennin <daniel.dehennin@baby-gnu.org> writes:
>
>> This version of the patch[1] fixes two problems of the previous one:
>>
>> 1. some SPLIT where duplicated because the group name was present in
>>    “gnus-newsrc-alist” and in “gnus-parameters”
>>
>> 2. using only groups from “gnus-newsrc-alist” avoid creating new ones
>>    automatically when splitting, now, a user just need to:
>>    1. add a new entry to “gnus-parameters”
>>    2. update “nnmail-split-fancy” with “gnus-group-split-update”
>>    3. subscribe to the new mailing list
>>    4. the splitting will create the new group automatically when the
>>       first mail arrives
>
> Thanks; I've now applied this to Ma Gnus 0.10.  Perhaps something needs
> to be documented in the manual, too?

I don't think, because the documentation of Group Mail Splitting already
says it use Group parameters.

I mostly consider this as a fix to behave like described in the
documentation ;-)

Regards.
-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF

[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]

Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'

[Lars Ingebrigtsen]

Daniel Dehennin <daniel.dehennin@baby-gnu.org> writes:

> I don't think, because the documentation of Group Mail Splitting already
> says it use Group parameters.
>
> I mostly consider this as a fix to behave like described in the
> documentation ;-)

Ah, right.  >"?

-- 
(domestic pets only, the antidote for overdose, milk.)
  bloggy blog http://lars.ingebrigtsen.no/