From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id MGfpH0m1rWLx7QAAbAwnHQ (envelope-from ) for ; Sat, 18 Jun 2022 13:21:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id CPb7Hkm1rWKn6QAAG6o9tA (envelope-from ) for ; Sat, 18 Jun 2022 13:21:45 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DD37D46358 for ; Sat, 18 Jun 2022 13:21:44 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id EB1555F407; Sat, 18 Jun 2022 11:21:41 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 4F9A95F029 for ; Sat, 18 Jun 2022 11:21:38 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 3D1945FBD7; Sat, 18 Jun 2022 07:21:37 -0400 (EDT) Received: (nullmailer pid 994863 invoked by uid 1000); Sat, 18 Jun 2022 11:21:34 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: Re: notmuch-git v3 In-Reply-To: <20220604172313.1149879-1-david@tethera.net> References: <20220604172313.1149879-1-david@tethera.net> Date: Sat, 18 Jun 2022 08:21:34 -0300 Message-ID: <87fsk2z075.fsf@tethera.net> MIME-Version: 1.0 Message-ID-Hash: IXBS6GCKMFRX5KPXA3INKGXOLSO2SKVJ X-Message-ID-Hash: IXBS6GCKMFRX5KPXA3INKGXOLSO2SKVJ X-MailFrom: david@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655551305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=EgMd2lNLh+es3OmdWPnWjrrrycl0og1vENdklkHHZDw=; b=WNzfMTU49DWMIFuHFqjre4Nhjsoya/al+oLsw199lMXTL4Fde0uHz6kMjVhi9evXqDOo2d iUf4I9SEUeV+kbBGmG+P9kyVanoCV2nXNi6kkd/AIO76IsuI5lTQu3V/3QQ/IyKikcBt3E BXu6WcVvDylaVbwI5F4xR+wZGzGqJOLQUKWL1Luyjh8iRA8km+M0zejurq6RJMt7fhHlfK ea5S7HmQbfMJB4+ukFUDgYMU2UX6OCzTvlfZ6lziM/IkcaLMGEtBq9sCCgDFpUIXs1nR4r xtkm4uM7ZxwP6ISsCunUjWspQdk0hNR4O7O2Kl5qMwCYdPtZH4sUOt08fDGmMQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655551305; a=rsa-sha256; cv=none; b=fUIakwO82UsEWjVTHP7EpY7m/qN9ENwFfUNDyfRQlBGGTcrJtPJrO6jch0ZEUn8U4Qn/UY ET8CPRG3Ivq0eLPON21ejgujl/LdnhWAvQanLV+EjnZOrjRWvNNd9kXc6J2OaDxiS/PrvA iPX+sgOoqTeMEwJ6kEVFlGgvlZa9Hy1wSuOZUQovBmYUXr6tE86kJXoULWGWIq7JHV8YPC vzzF9NCb8MnF+38i+UkODp9bCQkNif/Z0mTfvAVcG+rmCsff5nNOPUZUsyqNRwQ+9tWoBM ZpWxmo9BhXQC6nerOuT/TTDkna5lWHvaMxaVMATU9iQ1mxWwtkEWb0a+ysGgkQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -2.14 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: DD37D46358 X-Spam-Score: -2.14 X-Migadu-Scanner: scn1.migadu.com X-TUID: tMOmi94gY6N+ David Bremner writes: > This series is against branch "next", which is currently ahead of > master by the following 7 commits Slightly updated version of this series applied to master. Interdiff follows. diff --git a/Makefile.local b/Makefile.local index 0fadfb26..7699c208 100644 --- a/Makefile.local +++ b/Makefile.local @@ -45,6 +45,15 @@ $(SHA256_FILE): $(TAR_FILE) $(DETACHED_SIG_FILE): $(TAR_FILE) gpg --armor --detach-sign $^ +CLEAN := $(CLEAN) notmuch-git +notmuch-git: notmuch-git.py + cp $< $@ + chmod ugo+x $@ + +CLEAN := $(CLEAN) nmbug +nmbug: notmuch-git + ln -s $< $@ + .PHONY: dist dist: $(TAR_FILE) @@ -294,7 +303,7 @@ endif SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp -CLEAN := $(CLEAN) .deps notmuch-git +CLEAN := $(CLEAN) .deps DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config sphinx.config @@ -307,10 +316,6 @@ cppcheck: @echo "No cppcheck found during configure; skipping static checking" endif -nmbug notmuch-git: notmuch-git.in - sed s/@NOTMUCH_VERSION@/${VERSION}/ < notmuch-git.in > notmuch-git - chmod ugo+rx notmuch-git - ln -sf notmuch-git nmbug DEPS := $(SRCS:%.c=.deps/%.d) DEPS := $(DEPS:%.cc=.deps/%.d) diff --git a/notmuch-git.in b/notmuch-git.py old mode 100755 new mode 100644 similarity index 99% rename from notmuch-git.in rename to notmuch-git.py index 0e35db10..f188660c --- a/notmuch-git.in +++ b/notmuch-git.py @@ -40,8 +40,6 @@ from urllib.parse import quote as _quote from urllib.parse import unquote as _unquote import json as _json -__version__ = '@NOTMUCH_VERSION@' - _LOG = _logging.getLogger('nmbug') _LOG.setLevel(_logging.WARNING) _LOG.addHandler(_logging.StreamHandler()) @@ -380,7 +378,7 @@ def check_safe_fraction(status): _LOG.error('No existing tags with given prefix, stopping.'.format(safe)) _LOG.error('Use --force to override.') exit(1) - change = len(status['added'])+len(status['deleted'])+len(status['missing']) + change = len(status['added'])+len(status['deleted']) fraction = change/total _LOG.debug('total messages {:d}, change: {:d}, fraction: {:f}'.format(total,change,fraction)) if fraction > safe: @@ -935,9 +933,6 @@ if __name__ == '__main__': parser.add_argument( '-N', '--nmbug', action='store_true', help='Set defaults for --tag-prefix and --git-dir for the notmuch bug tracker') - parser.add_argument( - '-v', '--version', action='version', - version='%(prog)s {}'.format(__version__)) parser.add_argument( '-l', '--log-level', choices=['critical', 'error', 'warning', 'info', 'debug'], diff --git a/notmuch.c b/notmuch.c index a6c49bcb..c75b0188 100644 --- a/notmuch.c +++ b/notmuch.c @@ -201,8 +201,6 @@ static const command_t commands[] = { { "emacs-mua", NULL, 0, "send mail with notmuch and emacs." }, #endif - { "git", NULL, 0, - "manage notmuch tags with git" }, { "help", notmuch_help_command, NOTMUCH_COMMAND_CONFIG_CREATE, /* create but don't save config */ "This message, or more detailed help for the named command." } }; diff --git a/test/T850-git.sh b/test/T850-git.sh index a865c7bf..7ea50939 100755 --- a/test/T850-git.sh +++ b/test/T850-git.sh @@ -171,13 +171,14 @@ notmuch git -C tags.git checkout test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "status (global config argument)" -test_subtest_known_broken +cp notmuch-config notmuch-config.new +notmuch --config=notmuch-config.new config set git.path tags.git notmuch tag +test id:20091117190054.GU3165@dottiness.seas.harvard.edu -notmuch --config=./notmuch-config git -C tags.git status > OUTPUT +notmuch --config=./notmuch-config.new git status > OUTPUT cat < EXPECTED A 20091117190054.GU3165@dottiness.seas.harvard.edu test EOF -notmuch git -C tags.git checkout +notmuch --config=notmuch-config.new git checkout test_expect_equal_file EXPECTED OUTPUT test_begin_subtest "fetch"