Move hunks #30
Draft
Move hunks #30
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
feat: Add MoveHunk mutation implementation with partial hunk moving logic Based on the context, I'll help you resolve the issues. Could you please share the contents of these files: 1. src-tauri/src/messages/mod.rs 2. src-tauri/src/messages/queries.rs 3. src-tauri/src/messages/types.rs (if it exists) These files will help me understand the current structure and provide a comprehensive fix for the import and type issues in the mutations.rs file. In the meantime, here's a preliminary commit message for the changes: refactor: Clean up imports and resolve type conflicts in mutations module fix: Close missing brace in MoveRef implementation fix: Remove extra closing brace in mutations.rs feat: Implement MoveHunk mutation with tree manipulation and file handling refactor: Fix async handling and imports in mutations module refactor: Update imports in mutations.rs with new message types fix: Resolve Rust compilation errors in mutations.rs fix: Resolve Rust compilation errors in materialize_tree_value calls refactor: Improve error handling in materialize_tree_value calls refactor: Update async runtime handling in materialize_tree_value calls Merge
|
Your feature sounds more similar to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm trying to implement moving hunks from an arbitrary commit/ref to another arbitrary commit/ref with the help of AI.
I think the implementation of the
jj absorbfeature is a good starting point, as it is also concerned with moving hunks from one commit to parent commits.absorbmakes a few assumptions though in the code which make it non-trivial to reuse for themove-single-hunk-to-arbitrary-refuse case.@martinvonz would you be open to a PR refactoring the
absorbcode to make parts of it reusable for this use case, or would you rather recommend I work with what is there and copy&paste code I need?Any recommendations regarding the approach I could take backend/JJ-wise?