WIP: Fix/issue 251 #279
WIP: Fix/issue 251 #279
Conversation
The last version could not handle tags order by [0.3.0, 0.3.0a0, ...], it would try to delete 0.3.0a0
|
Nice, thanks for this 👍 Could you include a new command documentation in We are working on fixing the CI issue. |
commitizen/cli.py
Outdated
| "func": commands.Undo, | ||
| "arguments": [ | ||
| { | ||
| "name": ["--bump"], |
There was a problem hiding this comment.
What do you think of adding a shortcut here? -b and -c for commit?
We'd have cz undo -b
Sure~ 👍 |
|
@Sirius207 Even though we're working on the CI issue, would you help us ignore |
OK 👍 |
Codecov Report
@@ Coverage Diff @@
## master #279 +/- ##
==========================================
- Coverage 96.58% 96.37% -0.21%
==========================================
Files 33 34 +1
Lines 908 966 +58
==========================================
+ Hits 877 931 +54
- Misses 31 35 +4
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
|
|
||
|
|
||
| class Undo: | ||
| """Reset the latest git commit or git tag.""" |
There was a problem hiding this comment.
It seems we use various terms for the same meaning (i.e., reset / revert / undo). I'll suggest unifying them.
| self.arguments = arguments | ||
|
|
||
| def _get_bump_command(self): | ||
| created_tag = git.get_latest_tag() |
There was a problem hiding this comment.
Why is this one named as created_tag instead of latest_tag?
There was a problem hiding this comment.
The created_tag is original name and get_latest_tag comes later, I would use latest_tag in next commit. 👍
| commits = git.get_commits() | ||
|
|
||
| if created_tag and commits: | ||
| created_commit = commits[0] |
| return command | ||
|
|
||
| def __call__(self): | ||
| bump: bool = self.arguments.get("bump") |
There was a problem hiding this comment.
bump doesn't seem to be clear enough to me. How about something like reverting_bump?
| if bump: | ||
| command = self._get_bump_command() | ||
| elif commit: | ||
| command = "git reset HEAD~" |
There was a problem hiding this comment.
Sometimes we'll encounter the situation that we don't have HEAD. Will it be possible for us to solve that situation?
| out.error(c.err) | ||
|
|
||
| out.write(c.out) | ||
| out.success("Undo successful!") |
There was a problem hiding this comment.
Maybe Succeeded on undoning! or Undo successfully!?
|
Will use documentation for now, closing this |
Description
Follow the discussion of #251, I add the following command.
Checklist
./script/formatand./script/testlocally to ensure this change passes linter check and testExpected behavior
cz undo --bump: delete the latest tag and the related commitcz undo --commit: reset the latest commitSteps to Test This Pull Request
cz undo --bumpcz bumpcz undo --bumpcz undo --commitcz commitcz undo --commitAdditional context
If I execute the following statements first, the
git.get_tags()would get the tags order by[0.3.0a0, 0.3.0, ...].So I implement another function
git.get_latest_tag()