David Bremner <david@tethera.net> 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 <<EOF > 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" _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org