From 572259885af4d5858c3be5c2119ec7019e1ca617 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Mon, 16 Oct 2017 11:01:47 -0700 Subject: [PATCH] nmbug: Only error for invalid diff lines in tags/ Avoid: Traceback (most recent call last): File "/home/nmbug/bin/nmbug", line 834, in args.func(**kwargs) File "/home/nmbug/bin/nmbug", line 385, in checkout status = get_status() File "/home/nmbug/bin/nmbug", line 580, in get_status maybe_deleted = _diff_index(index=index, filter='D') File "/home/nmbug/bin/nmbug", line 658, in _diff_index for id, tag in _unpack_diff_lines(stream=p.stdout): File "/home/nmbug/bin/nmbug", line 678, in _unpack_diff_lines 'Invalid line in diff: {!r}'.format(line.strip())) ValueError: Invalid line in diff: u'.mailmap' With this commit, folks can commit READMEs, .mailmap, etc. to their nmbug repositories, and 'nmbug diff' and 'status' won't choke on them. If you want to check for this sort of thing, you can set --log-level to info or greater. nmbug will still error if the unrecognized path is under tags/, since that's more likely to be a user error. --- devel/nmbug/nmbug | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug index 0cd91148..8c7e925c 100755 --- a/devel/nmbug/nmbug +++ b/devel/nmbug/nmbug @@ -65,7 +65,8 @@ if _os.path.isdir(_NMBGIT): TAG_PREFIX = _os.getenv('NMBPREFIX', 'notmuch::') _HEX_ESCAPE_REGEX = _re.compile('%[0-9A-F]{2}') -_TAG_FILE_REGEX = _re.compile('tags/(?P[^/]*)/(?P[^/]*)') +_TAG_DIRECTORY = 'tags/' +_TAG_FILE_REGEX = _re.compile(_TAG_DIRECTORY + '(?P[^/]*)/(?P[^/]*)') # magic hash for Git (git hash-object -t blob /dev/null) _EMPTYBLOB = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391' @@ -683,8 +684,11 @@ def _unpack_diff_lines(stream): for line in stream: match = _TAG_FILE_REGEX.match(line.strip()) if not match: - raise ValueError( - 'Invalid line in diff: {!r}'.format(line.strip())) + message = 'non-tag line in diff: {!r}'.format(line.strip()) + if line.startswith(_TAG_DIRECTORY): + raise ValueError(message) + _LOG.info(message) + continue id = _unquote(match.group('id')) tag = _unquote(match.group('tag')) yield (id, tag)