Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Report what operation has been undone in jj op undo #4445

Merged
merged 2 commits into from
Sep 15, 2024
Merged

Report what operation has been undone in jj op undo #4445

merged 2 commits into from
Sep 15, 2024

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Sep 12, 2024

Fixes #4431

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have addedupdated tests to cover my changes

@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch 2 times, most recently from fb36de8 to 56db777 Compare September 12, 2024 14:53
PhilipMetzger
PhilipMetzger requested changes Sep 12, 2024
View reviewed changes
Copy link
Contributor

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We now have a commit style, so please adhere to it with by prefixing the commit message with undo: or cli:. The rest are minor nits.

CHANGELOG.md Outdated Show resolved Hide resolved
cli/src/commands/operation/undo.rs Outdated Show resolved Hide resolved
@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch 3 times, most recently from 46ae369 to 691ab48 Compare September 12, 2024 15:17
PhilipMetzger
PhilipMetzger approved these changes Sep 12, 2024
View reviewed changes
Copy link
Contributor

@PhilipMetzger PhilipMetzger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

yuja
yuja reviewed Sep 12, 2024
View reviewed changes
cli/src/commands/operation/undo.rs Outdated Show resolved Hide resolved
cli/tests/test_duplicate_command.rs Outdated Show resolved Hide resolved
@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch 5 times, most recently from a5865d8 to 084983d Compare September 15, 2024 08:59
@Veykril
Copy link
Member Author

Veykril commented Sep 15, 2024

Added an op_summary template now

@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch from 084983d to aaa0b03 Compare September 15, 2024 09:00
yuja
yuja approved these changes Sep 15, 2024
View reviewed changes
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

cli/src/commands/operation/undo.rs Outdated Show resolved Hide resolved
cli/src/commands/operation/diff.rs Outdated Show resolved Hide resolved
@Veykril Veykril mentioned this pull request Sep 15, 2024
Merged
4 tasks
@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch from aaa0b03 to b3b4083 Compare September 15, 2024 11:34
@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch from b3b4083 to 6755434 Compare September 15, 2024 11:45
@Veykril Veykril force-pushed the veykril/push-ylwpptvmnqwx branch from 6755434 to a6b2108 Compare September 15, 2024 12:00
@Veykril Veykril merged commit 7ff12ec into jj-vcs:main Sep 15, 2024
18 checks passed
@Veykril Veykril deleted the veykril/push-ylwpptvmnqwx branch September 15, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz left review comments

@yuja yuja yuja approved these changes

@PhilipMetzger PhilipMetzger PhilipMetzger approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

FR: jj undo should print what operation is being undone
4 participants
@Veykril @yuja @martinvonz @PhilipMetzger