Skip to content

Commit a15e5d5

Browse files
committed
properly error-out when no version tags are found in the repo
1 parent bfba08c commit a15e5d5

1 file changed

Lines changed: 3 additions & 20 deletions

File tree

version_query/git_query.py

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ def _latest_git_version_tag_on_branches(
5858
if result[2] is not None:
5959
results.append(result)
6060
if not results:
61-
assert main_commit_distance is not None
61+
if main_commit_distance is None:
62+
raise ValueError('reached max commit distance {} with no version tags in repo {}'
63+
.format(MAX_COMMIT_DISTANCE, repo))
6264
return main_commit_distance
6365
final_result = sorted(results, key=lambda _: _[2])[-1]
6466
_LOG.log(logging.NOTSET, 'result from %i branches is %s and %s',
@@ -107,25 +109,6 @@ def _latest_git_version_tag(
107109
if not isinstance(result, tuple):
108110
commit_distance = result # main_commit_distance
109111
break
110-
# _LOG.log(logging.NOTSET, 'entering %i branches...', len(commit.parents))
111-
# results = []
112-
# main_commit_distance = None
113-
# for parent in commit.parents:
114-
# try:
115-
# result = _latest_git_version_tag(
116-
# repo, assume_if_none, parent, commit_distance, skip_commits)
117-
# if main_commit_distance is None:
118-
# main_commit_distance = result[3]
119-
# except ValueError:
120-
# continue
121-
# if result[2] is not None:
122-
# results.append(result)
123-
# if not results:
124-
# commit_distance = main_commit_distance
125-
# break
126-
# result = sorted(results, key=lambda _: _[2])[-1]
127-
# _LOG.log(logging.NOTSET, 'result from %i branches is %s and %s',
128-
# len(commit.parents), *result[1:3])
129112
return result
130113
if not current_version_tags:
131114
if assume_if_none:

0 commit comments

Comments
 (0)