From 6c0b6c8e1c4a8ab139db3cadee26d05962c3ce2c Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 1 Jan 2016 22:07:42 -0800 Subject: [PATCH] nmbug-status: Wrap query phrases in parentheses when and-ing together For example: "query": ["tag:a", "tag:b or tag:c"] is now converted to: ( tag:a ) and ( tag:b or tag:c ) instead of the old: tag:a and tag:b or tag:c This helps us avoid confusion due to Xapian's higher-precedence AND [1], where the old query would be interpreted as: ( tag:a and tag:b ) or tag:c [1]: http://xapian.org/docs/queryparser.html --- NEWS | 3 +++ devel/nmbug/nmbug-status | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 6ccff2b9..0d9496d6 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,9 @@ Notmuch 0.22 (UNRELEASED) nmbug-status ------------ +`nmbug-status` now wraps query phrases in parentheses when and-ing +them together, to avoid confusion about clause grouping. + `nmbug-status` now supports `meta.message-url` to override the Gmane template. For example, you can use: diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index 9de80d36..94be6717 100755 --- a/devel/nmbug/nmbug-status +++ b/devel/nmbug/nmbug-status @@ -167,7 +167,8 @@ class Page (object): view['title'], sort_key)) if 'query-string' not in view: query = view['query'] - view['query-string'] = ' and '.join(query) + view['query-string'] = ' and '.join( + '( {} )'.format(q) for q in query) q = notmuch.Query(database, view['query-string']) q.set_sort(sort) threads = self._get_threads(messages=q.search_messages()) @@ -421,7 +422,7 @@ if args.list_views: elif args.get_query != None: for view in config['views']: if args.get_query == view['title']: - print(' and '.join(view['query'])) + print(' and '.join('( {} )'.format(q) for q in view['query'])) sys.exit(0) else: # only import notmuch if needed -- 2.39.2