Skip to content

Commit dad215f

Browse files
committed
refactor(changelog): oldest_rev related logic
1 parent 35194c3 commit dad215f

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

commitizen/changelog.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ def process_commit_message(
193193
"author_email": commit.author_email,
194194
**parsed.groupdict(),
195195
}
196-
processed = hook(message, commit) if hook else message
197-
if not processed:
196+
197+
if not (processed := hook(message, commit) if hook else message):
198198
return
199199

200200
processed_messages = [processed] if isinstance(processed, dict) else processed
@@ -355,8 +355,7 @@ def get_oldest_and_newest_rev(
355355
if not (newest_tag := rules.find_tag_for(tags, newest)):
356356
raise NoCommitsFoundError("Could not find a valid revision range.")
357357

358-
oldest_tag = None
359-
oldest_tag_name = None
358+
oldest_tag_name: str | None = None
360359
if oldest:
361360
if not (oldest_tag := rules.find_tag_for(tags, oldest)):
362361
raise NoCommitsFoundError("Could not find a valid revision range.")
@@ -368,17 +367,19 @@ def get_oldest_and_newest_rev(
368367
if not tags_range:
369368
raise NoCommitsFoundError("Could not find a valid revision range.")
370369

371-
oldest_rev = tags_range[-1].name
372370
newest_rev = newest_tag.name
373371

374372
# Return None for oldest_rev if:
375373
# 1. The oldest tag is the last tag in the list and matches the requested oldest tag, or
376374
# 2. The oldest and newest tags are the same
377-
if (
378-
oldest_rev == tags[-1].name
379-
and oldest_rev == oldest_tag_name
380-
or oldest_rev == newest_rev
381-
):
382-
return None, newest_rev
375+
oldest_rev: str | None = (
376+
None
377+
if (
378+
tags_range[-1].name == tags[-1].name
379+
and tags_range[-1].name == oldest_tag_name
380+
or tags_range[-1].name == newest_rev
381+
)
382+
else tags_range[-1].name
383+
)
383384

384385
return oldest_rev, newest_rev

0 commit comments

Comments
 (0)