Commit 45b9352

committed

fix(commands/bump): prevent using incremental changelog when it is set to false in config

1 parent fc54b51 commit 45b9352Copy full SHA for 45b9352

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,9 @@ def __call__(self) -> None: # noqa: C901`
`293`	`293`	`"unreleased_version": new_tag_version,`
`294`	`294`	`"template": self.template,`
`295`	`295`	`"extras": self.extras,`
`296`		`- "incremental": True,`
	`296`	`+ "incremental": self.config.mutated_settings.get(`
	`297`	`+ "changelog_incremental", True`
	`298`	`+ ),`
`297`	`299`	`"dry_run": True,`
`298`	`300`	`},`
`299`	`301`	`)`
`@@ -305,7 +307,9 @@ def __call__(self) -> None: # noqa: C901`
`305`	`307`	`self.config,`
`306`	`308`	`{`
`307`	`309`	`"unreleased_version": new_tag_version,`
`308`		`- "incremental": True,`
	`310`	`+ "incremental": self.config.mutated_settings.get(`
	`311`	`+ "changelog_incremental", True`
	`312`	`+ ),`
`309`	`313`	`"dry_run": dry_run,`
`310`	`314`	`"template": self.template,`
`311`	`315`	`"extras": self.extras,`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,16 @@ def __init__(self):`
`10`	`10`	`self._settings: Settings = DEFAULT_SETTINGS.copy()`
`11`	`11`	`self.encoding = self.settings["encoding"]`
`12`	`12`	`self._path: Path \| None = None`
	`13`	`+ self._settings_from_configs: Settings = {}`
`13`	`14`
`14`	`15`	`@property`
`15`	`16`	`def settings(self) -> Settings:`
`16`	`17`	`return self._settings`
`17`	`18`
	`19`	`+ @property`
	`20`	`+ def mutated_settings(self) -> Settings:`
	`21`	`+ return self._settings_from_configs`
	`22`	`+`
`18`	`23`	`@property`
`19`	`24`	`def path(self) -> Path \| None:`
`20`	`25`	`return self._path`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,6 @@ def _parse_setting(self, data: bytes \| str) -> None:`
`52`	`52`
`53`	`53`	`try:`
`54`	`54`	`self.settings.update(doc["commitizen"])`
	`55`	`+ self.mutated_settings.update(doc["commitizen"])`
`55`	`56`	`except KeyError:`
`56`	`57`	`self.is_empty_config = True`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,6 @@ def _parse_setting(self, data: bytes \| str) -> None:`
`58`	`58`
`59`	`59`	`try:`
`60`	`60`	`self.settings.update(doc["tool"]["commitizen"]) # type: ignore`
	`61`	`+ self.mutated_settings.update(doc["tool"]["commitizen"]) # type: ignore`
`61`	`62`	`except exceptions.NonExistentKey:`
`62`	`63`	`self.is_empty_config = True`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ def _parse_setting(self, data: bytes \| str) -> None:`
`38`	`38`
`39`	`39`	`try:`
`40`	`40`	`self.settings.update(doc["commitizen"])`
	`41`	`+ self.mutated_settings.update(doc["commitizen"])`
`41`	`42`	`except (KeyError, TypeError):`
`42`	`43`	`self.is_empty_config = True`
`43`	`44`

Comments

(0)