--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 6DD76431FBF\r
+ for <notmuch@notmuchmail.org>; Sun, 21 Jul 2013 01:28:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id QAjEgTtKoq83 for <notmuch@notmuchmail.org>;\r
+ Sun, 21 Jul 2013 01:28:30 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id BDD29431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 21 Jul 2013 01:28:29 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1V0p0E-0003St-22; Sun, 21 Jul 2013 09:28:28 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1V0p0D-0000ws-Nj; Sun, 21 Jul 2013 09:28:25 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [DRAFT PATCH] emacs: notmuch-version and version comparison with\r
+ CLI\r
+In-Reply-To: <1374090782-10273-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1374090782-10273-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.15.2+192~g8222af3 (http://notmuchmail.org) Emacs/23.4.1\r
+ (i486-pc-linux-gnu)\r
+Date: Sun, 21 Jul 2013 09:28:24 +0100\r
+Message-ID: <87li508ggn.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: e2a6555cedf29fa8db065af3fabd1b0f (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored 0.0 points. Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 21 Jul 2013 08:28:34 -0000\r
+\r
+\r
+Hi\r
+\r
+I think I would prefer some more specific versioning so that we don't\r
+have the warning unless we think we might need it. I often run notmuch\r
+over ssh and the two sides are often minorly out of sync so I think I\r
+would find a warning each time irritating. \r
+\r
+Maybe basing the message on "version + commits since last release" with\r
+ emacs knowing some minimum acceptable version?\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+ Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+\r
+> ---\r
+>\r
+> This is continuation of id:m2y59ag9yj.fsf@guru.guru-group.fi\r
+>\r
+> This is draft of code which could be used to do exact version comparison\r
+> between notmuch cli and notmuch Emacs MUA.\r
+>\r
+> In case the versions aren't exactly same a warning message is shown\r
+> to the user before notmuch-hello window is filled the first time.\r
+>\r
+> If this approach gets support I'll write more prepared patches\r
+> (in addition to make fully working patch...).\r
+>\r
+> Tomi\r
+>\r
+> emacs/Makefile.local | 4 +++-\r
+> emacs/notmuch-hello.el | 26 +++++++++++++++++++++++++-\r
+> 2 files changed, 28 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/emacs/Makefile.local b/emacs/Makefile.local\r
+> index a910aff..fd45d4a 100644\r
+> --- a/emacs/Makefile.local\r
+> +++ b/emacs/Makefile.local\r
+> @@ -36,7 +36,9 @@ $(dir)/.eldeps: $(dir)/Makefile.local $(dir)/make-deps.el $(emacs_sources)\r
+> CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp\r
+> \r
+> %.elc: %.el $(global_deps)\r
+> - $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<\r
+> + $(call quiet,EMACS) --directory emacs \\r
+> + --eval "(setq notmuch--version \"$(VERSION)\")" \\r
+> + -batch -f batch-byte-compile $<\r
+> \r
+> ifeq ($(WITH_EMACS),1)\r
+> ifeq ($(HAVE_EMACS),1)\r
+> diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+> index 147c08c..d97aee3 100644\r
+> --- a/emacs/notmuch-hello.el\r
+> +++ b/emacs/notmuch-hello.el\r
+> @@ -29,6 +29,18 @@\r
+> (declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line continuation))\r
+> (declare-function notmuch-poll "notmuch" ())\r
+> \r
+> +;; defconst notmuch-version to a value during build-time byte compilation...\r
+> +;; the compiled output will only contain the defconst definition\r
+> +(eval-when-compile\r
+> + (defmacro expand-defconst-notmuch-version ()\r
+> + `(if ,(boundp 'notmuch--version)\r
+> + (defconst notmuch-version ,notmuch--version\r
+> + "Version string for this version of Notmuch.")\r
+> + (defconst notmuch-version "unknown"\r
+> + "Placeholder for Notmuch version string. Set during build process.")))\r
+> +)\r
+> +(expand-defconst-notmuch-version)\r
+> +\r
+> (defcustom notmuch-hello-recent-searches-max 10\r
+> "The number of recent searches to display."\r
+> :type 'integer\r
+> @@ -762,7 +774,19 @@ following:\r
+> \r
+> (if no-display\r
+> (set-buffer "*notmuch-hello*")\r
+> - (switch-to-buffer "*notmuch-hello*"))\r
+> + (switch-to-buffer "*notmuch-hello*")\r
+> + (if notmuch-hello-first-run\r
+> + (let ((v (replace-regexp-in-string "^notmuch " ""\r
+> + (car (process-lines notmuch-command\r
+> + "--version")))))\r
+> + (unless (string= v notmuch-version)\r
+> + (save-excursion\r
+> + (erase-buffer)\r
+> + (insert "\r
+> +Notmuch CLI version: " v "\r
+> +Notmuch Emacs version: " notmuch-version "\r
+> +\r
+> +XXX") (y-or-n-p "Press y or n to continue"))))))\r
+> \r
+> (let ((target-line (line-number-at-pos))\r
+> (target-column (current-column))\r
+> -- \r
+> 1.8.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r
projects / notmuch-archives.git / commitdiff