M4.9: Git stash (stash, list, apply, pop, drop) with clear refusals
- crates/vcs: stash.rs (append) with Repo::stash, stash_list, stash_apply
and stash_drop; refusals decided structurally (no commit, nothing to
stash, unmerged files, conflicts after apply, missing or changed entry)
plus hints for overwritten and untracked files. Works around git leaving
untracked files behind under --literal-pathspecs. Repo::lock is
pub(crate), as for M4.8.
- engine: git.stash, git.stashList, git.stashApply {index, pop, hash?},
git.stashDrop through the M4.6 hook; gitChanged after changes.
- ui: stash dialog (vcs.stash, vcs.showStashes; Git menu, no shortcuts),
two buttons in the Changes window, dirty buffers saved first, drop asks.
- Tests: vcs integration and property tests, engine test, 13 Vitest tests.
- Docs: architecture section, G8, tooling checklist, roadmap, Git row
evidence (score left to the PM).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
65907d925a
commit
e09ef8b8c0
23 changed files with 2681 additions and 13 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# Tooling checklist
|
||||
|
||||
> **Status:** integrated terminal partial (M3.6), Git backend, Changes window, diff viewer, branches, log and remotes partial (M4.1, M4.2, M4.3, M4.5, M4.6, M4.10) · **Last updated:** 2026-10-28
|
||||
> **Status:** integrated terminal partial (M3.6), Git backend, Changes window, diff viewer, branches, log, remotes and stash partial (M4.1, M4.2, M4.3, M4.5, M4.6, M4.10, M4.9) · **Last updated:** 2026-10-28
|
||||
|
||||
- [ ] Integrated terminal with tabs
|
||||
- M3.6 (2026-10-18): PTY sessions (pwsh → powershell → cmd on Windows, `$SHELL` or `/bin/sh` on Unix; cwd = project root) in the bottom panel's Terminal tab, several terminals as sub-tabs, xterm.js rendering with Lutra's colours, copy/paste, resize, exit codes; closed with the project. Missing: settings, persistence across restarts, split tabs, search, links, the PHP interpreter in `PATH`.
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
- M4.6 (2026-10-28): Log tab with graph lanes, message and author filters and lazy paging; commit details with each file's diff at that commit; history of a file from the tree, the editor or the menu. Missing: date and branch filters, actions on commits (cherry-pick, revert, reset, checkout), comparing two commits, blame, conflicts, stash, push/pull.
|
||||
- M4.10 (2026-10-28): fetch, pull (merge or rebase, setting `git.pull.mode`; open files saved first) and push (upstream set on the first push), each with progress and Cancel in the status bar and explained refusals; Clone Repository… from any HTTPS or SSH URL or a path, then the project opens; Manage Remotes… (list with redacted URLs, add, change URL, remove). Sign-in stays with git's credential helper (its own window is allowed) and the ssh agent; terminal prompts are off, so a missing credential fails with a message. Tested against local bare repositories only. Missing: force push, tags, pushing to another branch name, fetch/pull of one branch, prune options, hosting features (pull requests, issues), checked against a real GitHub/GitLab/Forgejo server.
|
||||
- M4.8 (2026-10-28): merge a branch into the current one (Git › Merge…), list the conflicted files, resolve each in a three-pane view (current branch / result / merged branch) with accept left or right per chunk and accept all, apply and mark resolved, abort the merge after a confirmation. Missing: an ignore action, comparing base/local/remote, reverting a resolution, rebase and cherry-pick conflicts, merge-message prefill.
|
||||
- M4.9 (2026-10-30): stash the local changes with an optional message and optionally untracked files, then list, apply, pop or drop entries (Git menu and the Changes window), saving open files first; refusals say what to do (nothing to stash, no commit yet, unresolved conflicts, files that would be overwritten, a stash changed meanwhile). Missing: stashing selected files, a stash's diff, "unstash as branch", restoring the index, blame.
|
||||
- [ ] Composer: install, update, require, scripts
|
||||
- [ ] PHP interpreters: local, Docker
|
||||
- [ ] Xdebug via DAP: breakpoints, stepping, variables, watches
|
||||
|
|
@ -24,6 +25,7 @@
|
|||
|
||||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-30 | minor | Git: stash (M4.9) |
|
||||
| 2026-10-28 | minor | Git: log and file history (M4.6) |
|
||||
| 2026-10-28 | minor | Git: fetch, pull, push, clone and remote management (M4.10) |
|
||||
| 2026-10-26 | minor | Git: branch widget, checkout and new branch (M4.5) |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue