Commit b4dbd84

committed

refactor(changelog): fixes logic issue made evident by latest fix(git) commit

get_commits was calling git "git log None..None" in the event that a tag range is invalid. Raise exception sooner rather than later.

1 parent 5318325 commit b4dbd84Copy full SHA for b4dbd84

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`
`36`	`36`	`from commitizen import defaults`
`37`	`37`	`from commitizen.bump import normalize_tag`
`38`		`-from commitizen.exceptions import InvalidConfigurationError`
	`38`	`+from commitizen.exceptions import InvalidConfigurationError, NoCommitsFoundError`
`39`	`39`	`from commitizen.git import GitCommit, GitTag`
`40`	`40`
`41`	`41`
`@@ -309,7 +309,7 @@ def get_oldest_and_newest_rev(`
`309`	`309`
`310`	`310`	`tags_range = get_smart_tag_range(tags, newest=newest_tag, oldest=oldest_tag)`
`311`	`311`	`if not tags_range:`
`312`		`- returnNone, None`
	`312`	`+ raiseNoCommitsFoundError("Could not find a valid revision range.")`
`313`	`313`
`314`	`314`	`oldest_rev: Optional[str] = tags_range[-1].name`
`315`	`315`	`newest_rev = newest_tag`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -633,6 +633,7 @@ def test_changelog_from_rev_latest_version_from_arg(`
`633`	`633`	`def test_changelog_from_rev_single_version_not_found(`
`634`	`634`	`mocker, config_path, changelog_path`
`635`	`635`	`):`
	`636`	`+ """Provides an invalid revision ID to changelog command"""`
`636`	`637`	`with open(config_path, "a") as f:`
`637`	`638`	`f.write('tag_format = "$version"\n')`
`638`	`639`
`@@ -657,12 +658,13 @@ def test_changelog_from_rev_single_version_not_found(`
`657`	`658`	`with pytest.raises(NoCommitsFoundError) as excinfo:`
`658`	`659`	`cli.main()`
`659`	`660`
`660`		`- assert "No commits found" in str(excinfo)`
	`661`	`+ assert "Could not find a valid revision" in str(excinfo)`
`661`	`662`
`662`	`663`
`663`	`664`	`@pytest.mark.usefixtures("tmp_commitizen_project")`
`664`	`665`	`@pytest.mark.freeze_time("2022年02月13日")`
`665`	`666`	`def test_changelog_from_rev_range_version_not_found(mocker, config_path):`
	`667`	`+ """Provides an invalid end revision ID to changelog command"""`
`666`	`668`	`with open(config_path, "a") as f:`
`667`	`669`	`f.write('tag_format = "$version"\n')`
`668`	`670`
`@@ -684,7 +686,7 @@ def test_changelog_from_rev_range_version_not_found(mocker, config_path):`
`684`	`686`	`with pytest.raises(NoCommitsFoundError) as excinfo:`
`685`	`687`	`cli.main()`
`686`	`688`
`687`		`- assert "No commits found" in str(excinfo)`
	`689`	`+ assert "Could not find a valid revision" in str(excinfo)`
`688`	`690`
`689`	`691`
`690`	`692`	`@pytest.mark.usefixtures("tmp_commitizen_project")`

Comments

(0)