[PATCH 03/16] notmuch-git: add --tag-prefix argument

[David Bremner <david@tethera.net>]

The test suite will require setting the tag prefix (at least
initially), and this commit will enable doing that without relying on
environment variables (whose names are planned to change).
---
 notmuch-git.in | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/notmuch-git.in b/notmuch-git.in
index 62889303..81d604bb 100755
--- a/notmuch-git.in
+++ b/notmuch-git.in
@@ -58,8 +58,8 @@ _LOG.setLevel(_logging.WARNING)
 _LOG.addHandler(_logging.StreamHandler())
 
 NMBGIT = None
+TAG_PREFIX = None
 
-TAG_PREFIX = _os.getenv('NMBPREFIX', 'notmuch::')
 _HEX_ESCAPE_REGEX = _re.compile('%[0-9A-F]{2}')
 _TAG_DIRECTORY = 'tags/'
 _TAG_FILE_REGEX = _re.compile(_TAG_DIRECTORY + '(?P<id>[^/]*)/(?P<tag>[^/]*)')
@@ -105,10 +105,6 @@ def _hex_quote(string, safe='+@=:,'):
         lambda match: match.group(0).lower(),
         uppercase_escapes)
 
-
-_ENCODED_TAG_PREFIX = _hex_quote(TAG_PREFIX, safe='+@=,')  # quote ':'
-
-
 def _xapian_quote(string):
     """
     Quote a string for Xapian's QueryParser.
@@ -717,6 +713,10 @@ if __name__ == '__main__':
     parser.add_argument(
         '-C', '--git-dir', metavar='REPO',
         help='Git repository to operate on.')
+    parser.add_argument(
+        '-p', '--tag-prefix', metavar='PREFIX',
+        default = _os.getenv('NMBPREFIX', 'notmuch::'),
+        help='Prefix of tags to operate on.')
     parser.add_argument(
         '-v', '--version', action='version',
         version='%(prog)s {}'.format(__version__))
@@ -838,6 +838,9 @@ if __name__ == '__main__':
         if _os.path.isdir(_NMBGIT):
             NMBGIT = _NMBGIT
 
+    TAG_PREFIX = args.tag_prefix
+    _ENCODED_TAG_PREFIX = _hex_quote(TAG_PREFIX, safe='+@=,')  # quote ':'
+
     if args.log_level:
         level = getattr(_logging, args.log_level.upper())
         _LOG.setLevel(level)
-- 
2.35.2