diff options
| author | David Bremner <david@tethera.net> | 2022-03-20 13:13:06 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2022-06-17 08:40:19 -0300 |
| commit | b7b111b9b599897a873be61eb3db475bafda1ffe (patch) | |
| tree | 4a644344f3911a98352c4d25189b917110769db9 /notmuch-git.py | |
| parent | b7c31f658121a0cf92759a67e1c09951e7612b63 (diff) | |
notmuch-git: add --git-dir, --tag-prefix arguments
It is often more convenient to use command line arguments than
environment variables.
Diffstat (limited to 'notmuch-git.py')
| -rw-r--r-- | notmuch-git.py | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/notmuch-git.py b/notmuch-git.py index fb42e5bf..34d07125 100644 --- a/notmuch-git.py +++ b/notmuch-git.py @@ -50,13 +50,9 @@ _LOG = _logging.getLogger('nmbug') _LOG.setLevel(_logging.WARNING) _LOG.addHandler(_logging.StreamHandler()) -NMBGIT = _os.path.expanduser( - _os.getenv('NMBGIT', _os.path.join('~', '.nmbug'))) -_NMBGIT = _os.path.join(NMBGIT, '.git') -if _os.path.isdir(_NMBGIT): - NMBGIT = _NMBGIT +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>[^/]*)') @@ -77,10 +73,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. @@ -687,6 +679,13 @@ if __name__ == '__main__': description=__doc__.strip(), formatter_class=argparse.RawDescriptionHelpFormatter) 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( '-l', '--log-level', choices=['critical', 'error', 'warning', 'info', 'debug'], help='Log verbosity. Defaults to {!r}.'.format( @@ -795,6 +794,18 @@ if __name__ == '__main__': args = parser.parse_args() + if args.git_dir: + NMBGIT = args.git_dir + else: + NMBGIT = _os.path.expanduser( + _os.getenv('NMBGIT', _os.path.join('~', '.nmbug'))) + _NMBGIT = _os.path.join(NMBGIT, '.git') + 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) |