Implement core Git workflow commands: rebase, stash, worktree, cherry-pick/blame, smart search and UI updates#17
Merged
Conversation
Qodo reviews are paused for this user.Troubleshooting steps vary by plan Learn more → On a Teams plan? Using GitHub Enterprise Server, GitLab Self-Managed, or Bitbucket Data Center? |
GitPilot build artifacts are readyOne CI workflow run built all 3 desktop apps: open workflow run. Download links:
|
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
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.
Motivation
blamefor file history.git_checked_envhelper for interactive rebase sequencing.Description
get_rebase_stateandstart_interactive_rebaseinsrc-tauri/src/commands/rebase.rs, and implemented cross-platform sequence-editor script creation.src-tauri/src/commands/history.rsto allow conflict recovery and blame views.src-tauri/src/commands/stash.rsandsrc/components/stash/StashPanel.tsx.list_worktrees,create_worktree,remove_worktree) insrc-tauri/src/commands/worktree.rs.smart_searchcommand insrc-tauri/src/commands/search.rsfor commits, branches and tracked files.git_checked_envhelper tosrc-tauri/src/services/git_service.rsto rungitwith custom environment variables (used forGIT_SEQUENCE_EDITOR).RebaseState,RebaseTodoItem,BlameLine,WorktreeInfo, andSearchResultinsrc-tauri/src/models/git.rsandsrc/types/git.ts, and wired corresponding IPC methods insrc/services/gitService.tsandsrc-tauri/src/lib.rs.src/components/rebase/RebasePanel.tsx.src-tauri/src/services/conflict_parser.rs.README.md.Testing
git diff --checkand confirmed there are no whitespace/merge-check errors.npm run typecheck(tsc --noEmit) which succeeded with the updated TypeScript types.npm run build(Vite) which completed successfully.npm run tauri:check(cargo check) but the Rust build was blocked by the container missing the systemglib-2.0pkg-config dependency required byglib-sys, so full Rust verification could not complete in this environment.cargo fmtand added a small set of unit tests for the conflict parser (compiled as part of Rust test suite where system deps allow).Codex Task