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

copy-tracking: Initial Implementation #3962

Merged
merged 4 commits into from
Jul 4, 2024
Merged

copy-tracking: Initial Implementation #3962

merged 4 commits into from
Jul 4, 2024

Conversation

fowles
Copy link
Collaborator

@fowles fowles commented Jun 25, 2024 •
edited
Loading

The usage of this is not tied into the rest of jj so I have not updated the changelog, but I would like to move forward with this.

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

@ilyagr ilyagr marked this pull request as draft June 26, 2024 00:08
martinvonz
martinvonz reviewed Jun 26, 2024
View reviewed changes
Copy link
Owner

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

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

Looks generally good. There's of course some obvious problems, not only caring about the first root and first head commit.

There's also the design issue related to conflicts, which @ilyagr and I talked about on Discord a day or two ago. I don't think that will have huge impact on the code you've already written.

cli/tests/test_copy_detection.rs Outdated Show resolved Hide resolved
lib/Cargo.toml Outdated Show resolved Hide resolved
lib/src/git_backend.rs Outdated Show resolved Hide resolved
lib/src/git_backend.rs Show resolved Hide resolved
lib/src/git_backend.rs Outdated Show resolved Hide resolved
cli/src/commands/debug/copy_detection.rs Outdated Show resolved Hide resolved
@fowles fowles force-pushed the cp branch 4 times, most recently from 7098f58 to 73302c4 Compare June 26, 2024 19:06
@fowles fowles changed the title DO NOT SUBMIT copy: Initial Implementation of copy tracking copy-tracking: Initial Implementation Jun 27, 2024
@fowles fowles marked this pull request as ready for review June 29, 2024 20:53
PhilipMetzger
PhilipMetzger approved these changes Jul 2, 2024
View reviewed changes
Copy link
Collaborator

@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, just minor stuff left.

.ignore Outdated Show resolved Hide resolved
cli/examples/custom-backend/main.rs Outdated Show resolved Hide resolved
cli/tests/test_copy_detection.rs Outdated Show resolved Hide resolved
@fowles fowles force-pushed the cp branch 3 times, most recently from 3a54809 to 72fe2cb Compare July 4, 2024 00:07
@fowles fowles enabled auto-merge (rebase) July 4, 2024 00:21
@fowles fowles merged commit df8202a into martinvonz:main Jul 4, 2024
17 checks passed
@fowles fowles deleted the cp branch July 4, 2024 00:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhilipMetzger PhilipMetzger PhilipMetzger approved these changes

@martinvonz martinvonz martinvonz left review comments

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

Successfully merging this pull request may close these issues.
3 participants
@fowles @martinvonz @PhilipMetzger