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.

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

Add --reversed flag to evolog #5170

Merged
merged 1 commit into from
Jan 3, 2025
Merged

Conversation

JDSeiler
Copy link
Contributor

@JDSeiler JDSeiler commented Dec 21, 2024

Resolves #5088

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 added tests to cover my changes

Copy link

google-cla bot commented Dec 21, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@JDSeiler JDSeiler force-pushed the push-xprwowqypsyv branch 2 times, most recently from 979ad4a to 6c8a8ce Compare December 21, 2024 21:59
@PhilipMetzger
Copy link
Contributor

This can be at most two commits until Yuya shows up for the ReverseGraphIterator problem, so squash commits 1, 2 and 4 into the first commit. Also thanks for implementing it.

@JDSeiler
Copy link
Contributor Author

This can be at most two commits until Yuya shows up for the ReverseGraphIterator problem, so squash commits 1, 2 and 4 into the first commit. Also thanks for implementing it.

To make sure I understand: You'd like the second commit to be what is currently 32c4449 and then the first commit to be everything else? Some of the clippy lints apply to code from 32c444 so I might have to split it.

@PhilipMetzger
Copy link
Contributor

PhilipMetzger commented Dec 21, 2024

To make sure I understand: You'd like the second commit to be what is currently 32c4449 and then the first commit to be everything else?

No, you can add the flag, most of the implementation, test and CHANGELOG entry in a single commit while keeping a second commit (32c4449) with the fixed clippy lints, where Yuya will probably know the solution to whenever he shows up.

@JDSeiler JDSeiler force-pushed the push-xprwowqypsyv branch 2 times, most recently from c464993 to 5fbc376 Compare December 21, 2024 22:23
@JDSeiler
Copy link
Contributor Author

To make sure I understand: You'd like the second commit to be what is currently 32c4449 and then the first commit to be everything else?

No, you can add the flag, most of the implementation, test and CHANGELOG entry in a single commit while keeping a second commit (32c4449) with the fixed clippy lints, where Yuya will probably know the solution to whenever he shows up.

Ok I think I've got it all compressed. Let me know if it's not quite what you're looking for 👍

cli/src/commands/evolog.rs Outdated Show resolved Hide resolved
@JDSeiler JDSeiler force-pushed the push-xprwowqypsyv branch 2 times, most recently from edcb463 to 6ef0146 Compare December 27, 2024 19:42
@JDSeiler
Copy link
Contributor Author

@yuja I've pushed up some new changes based off your refactoring work. I hadn't realized the reverse_graph function had been merged, so there are some small changes from where I re-typed it. Happy to back out all/part of those.

@JDSeiler JDSeiler marked this pull request as ready for review December 27, 2024 19:48
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.

Minor nit, I'll let Yuya do the final review.

cli/src/commands/log.rs Outdated Show resolved Hide resolved
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/evolog.rs Outdated Show resolved Hide resolved
cli/src/commands/evolog.rs Outdated Show resolved Hide resolved
cli/src/graphlog.rs Show resolved Hide resolved
lib/src/graph.rs Outdated Show resolved Hide resolved
cli/src/commands/evolog.rs Outdated Show resolved Hide resolved
cli/src/commands/evolog.rs Outdated Show resolved Hide resolved
cli/src/commands/evolog.rs Outdated Show resolved Hide resolved
cli/src/commands/evolog.rs Outdated Show resolved Hide resolved
cli/src/graphlog.rs Show resolved Hide resolved
@JDSeiler JDSeiler force-pushed the push-xprwowqypsyv branch 2 times, most recently from f9f4495 to e27df6c Compare January 2, 2025 16:48
@JDSeiler
Copy link
Contributor Author

JDSeiler commented Jan 2, 2025

@yuja I think everything is resolved now.

UPDATE: I made one small follow-up correction since this update needed to be moved to the "unreleased" section of the changelog.

Adds some additional helper functions for converting between jj_lib's
GraphEdge and the graphlog's Edge type.
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.

LG, thanks!

cli/src/commands/evolog.rs Show resolved Hide resolved
cli/src/commands/evolog.rs Show resolved Hide resolved
@JDSeiler JDSeiler merged commit d5b0aa2 into jj-vcs:main Jan 3, 2025
19 checks passed
@JDSeiler JDSeiler deleted the push-xprwowqypsyv branch January 3, 2025 01:22
@zx8 zx8 mentioned this pull request Jan 3, 2025
4 tasks
@yuja yuja mentioned this pull request Jan 10, 2025
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

FR: Add --reversed flag to evolution-log
3 participants