github-starred/yaak
2
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-07-15 15:52:13 -05:00
Code Issues 124 Packages Projects Releases 112 Wiki Activity

[PR #458] [MERGED] Add live git status indicators #3311

New Issue
Closed
opened 2026-07-15 02:01:37 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-07-15 02:01:37 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/mountain-loop/yaak/pull/458
Author: @gschier
Created: 5/8/2026
Status: ✅ Merged
Merged: 5/8/2026
Merged by: @gschier

Base: main ← Head: git-worktree-status-checkpoint

📝 Commits (10+)

  • 411aeb9 Add lightweight git worktree status
  • 094426a Add live git worktree watcher
  • b2ec597 Stream git worktree status from watcher
  • 4a2e63d Show live git status in sidebar
  • 2c7a622 Merge branch 'main' into git-worktree-status-checkpoint
  • c1faee2 Avoid no-op tree item rename updates
  • 3a18a34 Remove unused git status query watcher
  • e8c9d93 Use live worktree status for git menu dirty state
  • 691735c Split git branch info from status
  • 8b155f7 Fix frontend timeout types

📊 Changes

35 files changed (+1672 additions, -548 deletions)

View changed files

📝 Cargo.lock (+1 -0)
📝 apps/yaak-client/components/EnvironmentEditDialog.tsx (+1 -1)
📝 apps/yaak-client/components/Sidebar.tsx (+159 -4)
📝 apps/yaak-client/components/core/HttpResponseDurationTag.tsx (+1 -1)
📝 apps/yaak-client/components/core/Tooltip.tsx (+1 -1)
➕ apps/yaak-client/components/git/FileHistoryDialog.tsx (+131 -0)
📝 apps/yaak-client/components/git/GitCommitDialog.tsx (+49 -9)
📝 apps/yaak-client/components/git/GitDropdown.tsx (+449 -422)
📝 apps/yaak-client/components/git/GitRemotesDialog.tsx (+3 -2)
📝 apps/yaak-client/components/git/HistoryDialog.tsx (+5 -7)
📝 apps/yaak-client/components/git/callbacks.tsx (+5 -0)
➕ apps/yaak-client/init/git.ts (+38 -0)
📝 apps/yaak-client/init/sync.ts (+33 -1)
📝 apps/yaak-client/lib/diffYaml.ts (+1 -2)
➕ apps/yaak-client/lib/gitWorktreeStatus.ts (+22 -0)
📝 apps/yaak-client/main.tsx (+2 -0)
📝 apps/yaak-client/package.json (+1 -0)
📝 apps/yaak-proxy/components/Sidebar.tsx (+1 -1)
📝 apps/yaak-proxy/package.json (+1 -0)
📝 crates-tauri/yaak-app-client/Cargo.toml (+1 -0)

...and 15 more files

📄 Description

Add live git status indication in the sidebar, along with the ability to view the history of a request/folder/etc, and easily revert any changes.

https://yaak.app/feedback/posts/uncommitted-changes-show-and-revert-per-request

image

Summary

  • Adds lightweight live git worktree status watching and streams status into the client.
  • Shows git status colors in the sidebar, including folder rollups for descendant changes.
  • Splits branch info from heavier commit/status data used by commit flows.
  • Adds restore actions and a file-specific history dialog with per-commit diffs.
  • Migrates atomFamily imports to jotai-family.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/mountain-loop/yaak/pull/458 **Author:** [@gschier](https://github.com/gschier) **Created:** 5/8/2026 **Status:** ✅ Merged **Merged:** 5/8/2026 **Merged by:** [@gschier](https://github.com/gschier) **Base:** `main` ← **Head:** `git-worktree-status-checkpoint` --- ### 📝 Commits (10+) - [`411aeb9`](https://github.com/mountain-loop/yaak/commit/411aeb94ef64cfaddf5bccbef9399f892c9803b1) Add lightweight git worktree status - [`094426a`](https://github.com/mountain-loop/yaak/commit/094426a50d0dd5586d5003b7b6b5f0f91c4071b4) Add live git worktree watcher - [`b2ec597`](https://github.com/mountain-loop/yaak/commit/b2ec597ffb611b252819201df1a86ee41bc5d613) Stream git worktree status from watcher - [`4a2e63d`](https://github.com/mountain-loop/yaak/commit/4a2e63d3d0c2a17e5842e709d7df15d50203330f) Show live git status in sidebar - [`2c7a622`](https://github.com/mountain-loop/yaak/commit/2c7a622f437684a57ac9fb29d9e1829c67c75996) Merge branch 'main' into git-worktree-status-checkpoint - [`c1faee2`](https://github.com/mountain-loop/yaak/commit/c1faee2e513d01e4cdf75024f71f3a7bd718f612) Avoid no-op tree item rename updates - [`3a18a34`](https://github.com/mountain-loop/yaak/commit/3a18a34f129b8bb57ccbbc662a8701edb6ee358c) Remove unused git status query watcher - [`e8c9d93`](https://github.com/mountain-loop/yaak/commit/e8c9d939d9a13524427de71a00e653314ea7b7d9) Use live worktree status for git menu dirty state - [`691735c`](https://github.com/mountain-loop/yaak/commit/691735cc720ba000c67dbdf0782d7b241eed6217) Split git branch info from status - [`8b155f7`](https://github.com/mountain-loop/yaak/commit/8b155f7b5e8c6fe840da1efe9c6813714b729977) Fix frontend timeout types ### 📊 Changes **35 files changed** (+1672 additions, -548 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+1 -0) 📝 `apps/yaak-client/components/EnvironmentEditDialog.tsx` (+1 -1) 📝 `apps/yaak-client/components/Sidebar.tsx` (+159 -4) 📝 `apps/yaak-client/components/core/HttpResponseDurationTag.tsx` (+1 -1) 📝 `apps/yaak-client/components/core/Tooltip.tsx` (+1 -1) ➕ `apps/yaak-client/components/git/FileHistoryDialog.tsx` (+131 -0) 📝 `apps/yaak-client/components/git/GitCommitDialog.tsx` (+49 -9) 📝 `apps/yaak-client/components/git/GitDropdown.tsx` (+449 -422) 📝 `apps/yaak-client/components/git/GitRemotesDialog.tsx` (+3 -2) 📝 `apps/yaak-client/components/git/HistoryDialog.tsx` (+5 -7) 📝 `apps/yaak-client/components/git/callbacks.tsx` (+5 -0) ➕ `apps/yaak-client/init/git.ts` (+38 -0) 📝 `apps/yaak-client/init/sync.ts` (+33 -1) 📝 `apps/yaak-client/lib/diffYaml.ts` (+1 -2) ➕ `apps/yaak-client/lib/gitWorktreeStatus.ts` (+22 -0) 📝 `apps/yaak-client/main.tsx` (+2 -0) 📝 `apps/yaak-client/package.json` (+1 -0) 📝 `apps/yaak-proxy/components/Sidebar.tsx` (+1 -1) 📝 `apps/yaak-proxy/package.json` (+1 -0) 📝 `crates-tauri/yaak-app-client/Cargo.toml` (+1 -0) _...and 15 more files_ </details> ### 📄 Description Add live git status indication in the sidebar, along with the ability to view the history of a request/folder/etc, and easily revert any changes. https://yaak.app/feedback/posts/uncommitted-changes-show-and-revert-per-request <img width="1448" height="776" alt="image" src="https://github.com/user-attachments/assets/72c8ca6d-a3c6-4851-ad11-273b6e3941c3" /> ## Summary - Adds lightweight live git worktree status watching and streams status into the client. - Shows git status colors in the sidebar, including folder rollups for descendant changes. - Splits branch info from heavier commit/status data used by commit flows. - Adds restore actions and a file-specific history dialog with per-commit diffs. - Migrates `atomFamily` imports to `jotai-family`. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-07-15 02:01:37 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
pull-request
Mirrored from GitHub Pull Request
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/yaak#3311
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?