From faee3537ab35c77c890055e43c9c7994ca28f383 Mon Sep 17 00:00:00 2001 From: Ian Main Date: Tue, 21 Oct 2014 15:19:25 +1700 Subject: [PATCH] RE: [PATCH] VIM: Respect exclude_tags specified in .notmuch-config --- c3/df24f6e4b8b6071a7f8a46924db7281e5ff041 | 174 ++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 c3/df24f6e4b8b6071a7f8a46924db7281e5ff041 diff --git a/c3/df24f6e4b8b6071a7f8a46924db7281e5ff041 b/c3/df24f6e4b8b6071a7f8a46924db7281e5ff041 new file mode 100644 index 000000000..4b097bb3e --- /dev/null +++ b/c3/df24f6e4b8b6071a7f8a46924db7281e5ff041 @@ -0,0 +1,174 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5F36C431FAF + for ; Mon, 20 Oct 2014 15:19:39 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id xLFopRdLUPoW for ; + Mon, 20 Oct 2014 15:19:31 -0700 (PDT) +Received: from cmta12.telus.net (cmta12.telus.net [209.171.16.85]) + by olra.theworths.org (Postfix) with ESMTP id DAD4C431FAE + for ; Mon, 20 Oct 2014 15:19:30 -0700 (PDT) +Received: from ovo.mains.priv ([207.102.88.62]) by cmta12.telus.net with TELUS + id 5aKU1p00P1LiWEf01aKV5x; Mon, 20 Oct 2014 16:19:29 -0600 +X-Authority-Analysis: v=2.0 cv=f5eW8pOM c=1 sm=2 + a=EcQDfIwDZEqJA1f7rVUV8Q==:17 a=K_0WnIvp2iAA:10 a=IkcTkHD0fZMA:10 + a=20KFwNOVAAAA:8 a=NEAV23lmAAAA:8 a=pGLkceISAAAA:8 a=7343-z1_AAAA:8 + a=tF0a7Xq1XadDFynQDDYA:9 a=QEXdDO2ut3YA:10 a=MSl-tDqOz04A:10 + a=0c-eHkXYtrgA:10 a=Nl_s-tunX1HkTbTC:21 a=GhVT38N_fK9wFNyF:21 + a=EcQDfIwDZEqJA1f7rVUV8Q==:117 +X-Telus-Outbound-IP: 207.102.88.62 +Received: from ovo.mains.priv (localhost.localdomain [127.0.0.1]) + by ovo.mains.priv (8.14.8/8.14.8) with ESMTP id s9KMJQdk007991; + Mon, 20 Oct 2014 15:19:28 -0700 +Received: (from imain@localhost) + by ovo.mains.priv (8.14.8/8.14.8/Submit) id s9KMJPs0007990; + Mon, 20 Oct 2014 15:19:25 -0700 +X-Authentication-Warning: ovo.mains.priv: imain set sender to imain@redhat.com + using -f +Date: Mon, 20 Oct 2014 15:19:25 -0700 +From: Ian Main +To: Franz Fellner +Message-ID: <54458a6d35fec_1c87f9fe982c@ovo.mains.priv.notmuch> +In-Reply-To: <54456203c37d0_25b371be98d9@TP_L520.notmuch> +References: <20141017180750.GE20696@TP_L520.localdomain> + <5445508493932_ce1af5e886b@ovo.mains.priv.notmuch> + <54456203c37d0_25b371be98d9@TP_L520.notmuch> +Subject: RE: [PATCH] VIM: Respect exclude_tags specified in .notmuch-config +Mime-Version: 1.0 +Content-Type: text/plain; + charset=utf-8 +Content-Transfer-Encoding: 7bit +Cc: notmuch@notmuchmail.org +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 20 Oct 2014 22:19:39 -0000 + +Franz Fellner wrote: +> Ian Main wrote: +> > +> > Thanks Franz! +> > +> > So this works well in the main searches by not showing anything I have marked +> > as 'spam'. However if I force a search for tag:spam and then try to view any +> > of the messages presented they will not show up because of the way we display +> > the email.. :-/ +> +> Yes, the patch did not work perfectly. +> I already fixed that but forgot to send a new PATCH here - Mostly +> bacause my git-skills are - ehh - no idea... +> I now spent half an hour to somehow get a merged version of those two commits +> and ended up with a simple "git diff"... +> If you have a good how-to that describes such things I would be happy, because I also +> miss the common terms how things are called in git and searching without knowing +> what exactly I am looking for is hard... +> +> Here is the commit: +> https://github.com/ff2000/notmuch/commit/4fde250b53ce450fec3393d8578458d521a69c91 +> New patch coming soon. +> +> Franz + +If you are working off the same patch that you already posted you would generally +do work on that branch and then you can do: + +git add ... +git commit --amend + +which commits the new stuff on top of the same commit you already had. + +To send to the mailing list, I use: + +git format-patch -1 +(check the patch output..) +git send-email + +which requires that you have your .gitconfig set up to have the list address +and such. + +Also you can look into 'git cherry-pick' to grab commits from other branches +and 'git rebase -i' which allows you to squash commits together. eg: + +git rebase -i HEAD~2 + +lets you squash the last two patches together by adding 'squash' to the +front of the latest commit. + +Hopefully that helps and I didn't misinterpret what you needed. + + Ian + + + +> > +> > I'm not sure what is the best way to fix this.. +> > +> > Ian +> > +> > Franz Fellner wrote: +> > > commit 558719b9ea9c218117c448cf4c7bd671de14d968 +> > > Author: Franz Fellner +> > > Date: Fri Oct 17 17:53:58 2014 +0200 +> > > +> > > Exclude tags specified by +> > > notmuch config get search.exclude_tags +> > > +> > > diff --git a/vim/notmuch.vim b/vim/notmuch.vim +> > > index 5c86fcd..b8d11fe 100644 +> > > --- a/vim/notmuch.vim +> > > +++ b/vim/notmuch.vim +> > > @@ -647,6 +647,7 @@ ruby << EOF +> > > $db_name = nil +> > > $all_emails = [] +> > > $email = $email_name = $email_address = nil +> > > + $exclude_tags = [] +> > > $searches = [] +> > > $threads = [] +> > > $messages = [] +> > > @@ -672,6 +673,8 @@ ruby << EOF +> > > # Add the primary to this too as we use it for checking +> > > # addresses when doing a reply +> > > $all_emails.unshift($email_address) +> > > + ignore_tags = get_config_item('search.exclude_tags') +> > > + $exclude_tags = ignore_tags.split("\n") +> > > end +> > > +> > > def vim_puts(s) +> > > @@ -924,6 +927,9 @@ ruby << EOF +> > > +> > > def query(*args) +> > > q = @db.query(*args) +> > > + $exclude_tags.each { |t| +> > > + q.add_tag_exclude(t) +> > > + } +> > > @queries << q +> > > q +> > > end +> > > _______________________________________________ +> > > notmuch mailing list +> > > notmuch@notmuchmail.org +> > > http://notmuchmail.org/mailman/listinfo/notmuch +> > +> > +> +> + + -- 2.26.2