Commit a6d1941

committed

fix(changelog): sort the commits properly to their version

1 parent 5ed9461 commit a6d1941Copy full SHA for a6d1941

File tree

3 files changed

+17

-19

lines changed

CHANGELOG.md
commitizen
- commands
  - changelog.py
- git.py

3 files changed

+17

-19

lines changed

`‎CHANGELOG.md‎`

Lines changed: 13 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,11 @@`
`1`	`1`
	`2`	`+## Unreleased`
`2`	`3`
	`4`	`+### Fix`
	`5`	`+`
	`6`	`+- changelog: sort the commits properly to their version`
`3`	`7`
`4`		`-## v1.19.0`
	`8`	`+## v1.19.0 (2020年05月02日)`
`5`	`9`
`6`	`10`	`### Fix`
`7`	`11`
`@@ -13,11 +17,6 @@`
`13`	`17`	`- changelog: add support for any commit rule system`
`14`	`18`	`- changelog: add incremental flag`
`15`	`19`
`16`		`-### Refactor`
`17`		`-`
`18`		`-- changelog: use functions from changelog.py`
`19`		`-- changelog: rename category to change_type to fit 'keep a changelog'`
`20`		`-`
`21`	`20`	`## v1.18.3 (2020年04月22日)`
`22`	`21`
`23`	`22`	`### Refactor`
`@@ -29,6 +28,8 @@`
`29`	`28`	`### Refactor`
`30`	`29`
`31`	`30`	`- git: replace GitCommit.message code with one-liner`
	`31`	`+- changelog: use functions from changelog.py`
	`32`	`+- changelog: rename category to change_type to fit 'keep a changelog'`
`32`	`33`	`- templates: rename as "keep_a_changelog_template.j2"`
`33`	`34`	`- templates: remove unneeded __init__ file`
`34`	`35`	`- cli: reorder commands`
`@@ -164,20 +165,20 @@`
`164`	`165`	`### Refactor`
`165`	`166`
`166`	`167`	`- tests/commands/bump: use tmp_dir to replace self implemented tmp dir behavior`
	`168`	`+- git: make find_git_project_root return None if it's not a git project`
	`169`	`+- config/base_config: make set_key not implemented`
	`170`	`+- error_codes: move all the error_codes to a module`
	`171`	`+- config: replace string type path with pathlib.Path`
`167`	`172`	`- test_bump_command: rename camel case variables`
`168`	`173`	`- tests/commands/check: use pytest fixture tmpdir replace self implemented contextmanager`
`169`	`174`	`- test/commands/other: replace unit test style mock with mocker fixture`
`170`	`175`	`- tests/commands: separate command unit tests into modules`
`171`	`176`	`- tests/commands: make commands related tests a module`
`172`		`-- git: make find_git_project_root return None if it's not a git project`
`173`		`-- config/base_config: make set_key not implemented`
`174`		`-- error_codes: move all the error_codes to a module`
`175`		`-- config: replace string type path with pathlib.Path`
`176`	`177`
`177`	`178`	`### Fix`
`178`	`179`
`179`		`-- cli: fix --version not functional`
`180`	`180`	`- git: remove breakline in the return value of find_git_project_root`
	`181`	`+- cli: fix --version not functional`
`181`	`182`
`182`	`183`	`### Feat`
`183`	`184`
`@@ -287,10 +288,10 @@`
`287`	`288`	`- config: add deprecation warning for loading config from ini files`
`288`	`289`	`- cz/customize: add jinja support to enhance template flexibility`
`289`	`290`	`- cz/filters: add required_validator and multiple_line_breaker`
`290`		`-- Commands/commit: add ́--dry-run ́ flag to the Commit command`
`291`	`291`	`- cz/cz_customize: implement info to support info and info_path`
`292`	`292`	`- cz/cz_customize: enable bump_pattern bump_map customization`
`293`	`293`	`- cz/cz_customize: implement customizable cz`
	`294`	`+- Commands/commit: add ́--dry-run ́ flag to the Commit command`
`294`	`295`	`- new 'git-cz' entrypoint`
`295`	`296`
`296`	`297`	`### Refactor`
`@@ -501,10 +502,6 @@`
`501`	`502`
`502`	`503`	`## v0.9.2 (2017年11月11日)`
`503`	`504`
`504`		`-### Refactor`
`505`		`-`
`506`		`-- renamed conventional_changelog to conventional_commits, not backward compatible:`
`507`		`-`
`508`	`505`	`## v0.9.1 (2017年11月11日)`
`509`	`506`
`510`	`507`	`### Fix`

`‎commitizen/commands/changelog.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ def __call__(self):`
`77`	`77`	`if latest_version:`
`78`	`78`	`start_rev = self._find_incremental_rev(latest_version, tags)`
`79`	`79`
`80`		`- commits = git.get_commits(start=start_rev)`
	`80`	`+ commits = git.get_commits(start=start_rev, args="--author-date-order")`
`81`	`81`	`if not commits:`
`82`	`82`	`out.error("No commits found")`
`83`	`83`	`raise SystemExit(NO_COMMITS_FOUND)`

`‎commitizen/git.py‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ def tag(tag: str):`
`46`	`46`	`return c`
`47`	`47`
`48`	`48`
`49`		`-def commit(message: str, args=""):`
	`49`	`+def commit(message: str, args: str=""):`
`50`	`50`	`f = NamedTemporaryFile("wb", delete=False)`
`51`	`51`	`f.write(message.encode("utf-8"))`
`52`	`52`	`f.close()`
`@@ -61,11 +61,12 @@ def get_commits(`
`61`	`61`	`*,`
`62`	`62`	`log_format: str = "%H%n%s%n%b",`
`63`	`63`	`delimiter: str = "----------commit-delimiter----------",`
	`64`	`+ args: str = "",`
`64`	`65`	`) -> List[GitCommit]:`
`65`	`66`	`"""`
`66`	`67`	`Get the commits betweeen start and end`
`67`	`68`	`"""`
`68`		`- git_log_cmd = f"git log --pretty={log_format}{delimiter}"`
	`69`	`+ git_log_cmd = f"git log --pretty={log_format}{delimiter}{args}"`
`69`	`70`
`70`	`71`	`if start:`
`71`	`72`	`c = cmd.run(f"{git_log_cmd} {start}..{end}")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit a6d1941

File tree

3 files changed

3 files changed

`‎CHANGELOG.md‎`

`‎commitizen/commands/changelog.py‎`

`‎commitizen/git.py‎`

0 commit comments