Commit 7d2d170
feat(worktrees): worktree management popup (list, switch, create, remove, lock)
Adds a Worktrees popup (Shift+W, available from any tab) to manage git
worktrees without leaving gitui:
- list the primary + linked worktrees with branch / path / lock / valid
markers (* marks the current one)
- switch to the selected worktree (Enter), reusing the existing repo-switch
flow
- create a worktree at a path (c) with a new branch named after the final
path component; missing parent dirs are created
- remove a worktree (Shift+D) via a y/n confirmation; refused if it is the
current tree, is locked, or has uncommitted / staged / untracked changes
- lock / unlock a worktree (l)
Backend is git2-native in asyncgit/src/sync/worktree.rs (get_worktrees /
create_worktree / remove_worktree / toggle_worktree_lock) with tests; UI in
src/popups/{worktrees,create_worktree}.rs.
Also fixes a pre-existing bug where the first keystroke after switching
worktree/submodule was dropped, by sharing the input reader across app
restarts.
Squashed from branch feat/worktrees (PR gitui-org#2995).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BMQxBdr5f3B3jmDtdvGtTu1 parent 685cca9 commit 7d2d170
14 files changed
Lines changed: 1364 additions & 16 deletions
File tree
- asyncgit/src/sync
- src
- keys
- popups
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
12 | 15 | | |
13 | 16 | | |
14 | 17 | | |
| |||
17 | 20 | | |
18 | 21 | | |
19 | 22 | | |
| 23 | + | |
20 | 24 | | |
21 | 25 | | |
22 | 26 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| 37 | + | |
37 | 38 | | |
38 | 39 | | |
39 | 40 | | |
| |||
108 | 109 | | |
109 | 110 | | |
110 | 111 | | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
111 | 116 | | |
112 | 117 | | |
113 | 118 | | |
| |||
0 commit comments