Develop#15
Merged
Merged
Conversation
Update the type check in `showDiff` to allow `StagedFileNode` in addition to `ChangedFileNode`, ensuring staged changes can also be displayed in the diff view.
Add the ability to publish local branches to origin. This includes: - Adding a `publishBranch` command and its corresponding implementation in `GitOperationsDelegate`. - Updating `GitService` to use `git branch -vv` to detect upstream tracking status. - Refactoring branch models to replace `AheadBehindModel` with `BranchInfoModel` which includes `hasUpstream` information. - Updating the Git tree view to show a "Publish Branch" action for local branches that do not have an upstream configured. - Updating command visibility logic in `package.json` to support new context values.
Update the publish branch command to refresh the remote branches node in the tree view, ensuring the UI stays in sync with the remote state. Also update `refreshRemoteBranchesNode` to be asynchronous. Includes integration and unit tests for the publish branch functionality.
Add support for the `git fetch --prune` command to the extension, allowing users to update remote tracking branches. This includes new commands in the tree view and integration tests. Additionally, refactor the `Notifications` service to support modal dialogs and success messages, and improve the extension activation process by verifying Git availability on startup. - Implement `gops.fetch` command and service method - Add `git fetch --prune` functionality - Update `Notifications` to support modal options and success icons - Add Git availability check during extension activation - Improve branch deletion safety by preventing deletion of the current branch - Update README with new feature descriptions - Add unit and integration tests for new functionality
Implement support for Git stash operations, including stashing current changes and popping specific stashes from the stash list. This includes new commands, tree view integration via `StashNode`, and updated service methods. - Add `gops.stashChanges` and `gops.popStash` commands - Implement `stashChanges` and `popStash` in `GitService` - Introduce `StashNode` for enhanced tree view representation - Update `TreeDataProvider` to include stash entries in the view - Add integration and unit tests for stash operations - Update `package.json` with new command definitions and view context visibility
Improve the Git Graph webview by displaying merge commit indicators and branch references. This update includes data model enhancements to support more detailed commit information and updated CSS for styling reference badges. - Update `GitCommitModel` to include `isMergeCommit` and `refs` - Enhance `GitService.getBranchCommits` to fetch detailed commit metadata using custom git log formats - Add `[MERGE]` prefix to merge commit messages in the webview - Implement visual badges for commit references in the graph table - Add styling for `.refs` badges in `gitGraph.css`
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
1 participant
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.
No description provided.