Archived
Show staged pins in the tree
A staged pin was only visible in the detail pane, so the header's "n pin staged" could not be traced to a row. The status column now shows a blue "staged" instead of "in sync", a blue marker after an issue word, and the marker on collapsed rows with a staged pin below. It is still not an issue and not counted in +n. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -246,3 +246,15 @@ usual keys. A filtered-out selection moves to the next visible submodule
|
||||
(previous if none follows) instead of the first, so the cursor stays near
|
||||
where it was. This adds the `bubbles/textinput` dependency (and its
|
||||
`atotto/clipboard` import).
|
||||
|
||||
## Staged pin is shown in the tree, but is not an issue
|
||||
|
||||
A staged pin was only visible in the detail pane, so the header's `1 pin
|
||||
staged` could not be traced to a row, and `in sync nothing to do` was
|
||||
wrong for a submodule whose pin change still has to be committed. The tree
|
||||
now shows it in the status column: blue `staged` replaces `in sync`; next to
|
||||
an issue word it is a blue `●` (an issue wins the word, since the cell holds
|
||||
one word, D3). It is not counted in `+n`, because `+n` and the header count
|
||||
issues and a staged pin stays quiet (D4). A collapsed row shows `●` if a
|
||||
staged pin is hidden below it (`Hidden.Staged`), placed before the `·k`
|
||||
counts so truncation of the 16-column cell cuts the counts first.
|
||||
|
||||
@@ -35,7 +35,7 @@ commit hashes. It doesn't answer the questions users actually have:
|
||||
e.g. `[2]`.
|
||||
- **F6** A collapsed submodule shows the number of issues **hidden** in all
|
||||
its descendants (`·1 ·2`), one count per level: errors in red, then
|
||||
warnings in yellow.
|
||||
warnings in yellow. A staged pin below shows as a blue `●` before them.
|
||||
- **F7** Expansion state of descendants is remembered when a parent is
|
||||
collapsed and restored when it is expanded again (except after
|
||||
"collapse all", which resets it).
|
||||
@@ -44,7 +44,8 @@ commit hashes. It doesn't answer the questions users actually have:
|
||||
|
||||
- **F10** Each submodule shows at most **one** state word: the most severe
|
||||
issue, plus `+n` if there are more. Submodules without issues show a
|
||||
muted `in sync`.
|
||||
muted `in sync`, or a blue `staged` if their pin change is staged. With
|
||||
issues, a staged pin adds a blue `●` after the word.
|
||||
See [state-model.md](state-model.md) for the full rules.
|
||||
- **F11** Each submodule shows its pin as a ref (`origin/main`, a tag, or a
|
||||
short SHA as a fallback) and the distance to that ref (`↑n`, `↓n`, `↑n↓m`).
|
||||
|
||||
@@ -82,6 +82,8 @@ Rules:
|
||||
changed.
|
||||
- **Not issues** (quiet): in sync, pin behind/ahead/diverged but pushed,
|
||||
staged pin, detached HEAD on the pin. They are shown as information only.
|
||||
A staged pin is also visible in the tree (`staged` or a `●` marker), see
|
||||
[ux-guide.md](ux-guide.md#tree-row), but is never counted as an issue.
|
||||
- A loading error is shown as `error` (Danger) in the UI; it is not an issue
|
||||
kind.
|
||||
|
||||
|
||||
+4
-4
@@ -63,7 +63,7 @@ indent ▸ name [n] status ref delta
|
||||
| indent | 2 per depth | |
|
||||
| toggle | 3 | `▸` collapsed, `▾` expanded, blank for leaves |
|
||||
| name | fits the widest visible name | name, `[n]` = direct children (collapsed only) |
|
||||
| status | 16 | issue word, `+n`, `·k` hidden issues per level (red, then yellow); muted `in sync` without issues; spinner while loading |
|
||||
| status | 16 | issue word, `+n`, `●` staged pin, `·k` hidden issues per level (red, then yellow); blue `staged` or muted `in sync` without issues; spinner while loading |
|
||||
| ref | widest ref, max 22 | resolved ref; muted short SHA if unresolved |
|
||||
| delta | 6 | `↑n`, `↓n`, `↑n↓m` |
|
||||
|
||||
@@ -77,8 +77,8 @@ indent ▸ name [n] status ref delta
|
||||
|
||||
1. Directory (muted) and name (bold)
|
||||
2. One line per issue: word (colored, 10 columns) + explanation;
|
||||
`in sync nothing to do` if there are none; `staged` and
|
||||
`detached HEAD on pin` as information
|
||||
`in sync nothing to do` if there are none and no pin is staged;
|
||||
`staged` and `detached HEAD on pin` as information
|
||||
3. `Changes` (only with uncommitted changes), see
|
||||
[Change preview](#change-preview)
|
||||
4. `Ref` with distance and `via <rule>`; `Fetched <age>` of the submodule;
|
||||
@@ -165,7 +165,7 @@ colors in components.
|
||||
|---|---|---|
|
||||
| Danger | ANSI `1` red, bold | `unpushed`, `conflict`, `error`, `↑n` of an unpushed pin |
|
||||
| Warn | ANSI `3` yellow | `missing`, `off pin`, `changed`, differing checkout SHA |
|
||||
| Info | ANSI `4` blue | `staged` |
|
||||
| Info | ANSI `4` blue | `staged`, the `●` staged marker |
|
||||
| Primary | ANSI `6` cyan | branch names, commit hashes, spinner |
|
||||
| Muted | ANSI `8` grey | quiet rows, directory headers, arrows, labels |
|
||||
| Text | terminal default | normal text |
|
||||
|
||||
Reference in New Issue
Block a user