Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,19 @@ the resolved app appearance automatically.
merge, and a fully keyboard-operable interactive rebase (reorder, reword,
edit/pause-to-amend, squash, fixup, drop, and merge preservation) with
pause/conflict Continue / Abort.
- **Patch interchange** — preview affected paths and validate patch imports
into the working tree, index, or both; import mailboxes with original authors
and Continue / Skip / Abort recovery; verify bundle refs and prerequisites,
import into a new branch, and export full or incremental bundles.
- **Git-flow workflows** — opt-in Git-flow AVH detection and repository
configuration, reviewed feature/release/hotfix start and finish, streamed
output, and merge recovery that retains already completed stages.
- **Advanced Git refs** — inspect and edit Git notes and replacement refs;
retarget or re-annotate existing unsigned tags with old/new targets and
optional remote publication checks. External edits require a fresh review.
- **Guided bisect** — start from known good/bad revisions, test and mark
good/bad/skip, inspect remaining candidates and the culprit, resume external
sessions, and reset to the original checkout while protecting test edits.
- **Commit graph** — SVG lanes with branch/tag chips, revealable inline stash
nodes with non-mutating diff inspection, a
resizable commit detail panel with lazy GPG/SSH/X.509 verification,
Expand Down
42 changes: 39 additions & 3 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2154,7 +2154,8 @@ and Store certification remain external gates.
never touches credentials). Designed 2026-06-12: `docs/remote-ssh.md`
+ task breakdown in TASKS.md. Pre-1.0 guardrails (opaque repo paths,
everything through the `commands.rs` seam) are active now.
- Git-flow (start/finish feature/release/hotfix; shells out to `git-flow`)
- ☑ Git-flow (F19: opt-in Git-flow AVH detection/configuration, reviewed
feature/release/hotfix start/finish and recovery from partial completion)
- ☑ Git LFS — filter-correct staging/checkout/discard/hard reset and explicit
setup, patterns, object/transfer status and server locks (`LfsDialog`,
`Repo::lfs_action`); real Git fixtures and native dialog verification pass.
Expand All @@ -2164,9 +2165,14 @@ and Store certification remain external gates.
GitHub Releases channel)
- Opt-in product telemetry only if a concrete post-1.0 decision, disclosure,
retention policy, and backend justify adding it
- Guided Git bisect
- ☑ Guided Git bisect (F10: manual good/bad/skip, progress/culprit,
external-session resume, clean-tree reset and reviewed original target)
- ☑ Advanced refs (F18: Git notes, replace refs, explicit tag retarget/re-annotation
with stale-write guards and remote publication checks; native desktop verified)
- Sparse checkout (cone mode first)
- Patch import/mailbox and Git bundle workflows
- ☑ Patch import/mailbox and Git bundle workflows (F07: `InterchangeDialog`,
validation, author-preserving mailbox recovery and new-branch bundle import;
native desktop flows verified)
- ☑ Expanded submodule lifecycle — guarded add/remove/deinit/sync/URL, paged
nested inspection and cancellable updates (`SubmoduleDialog`); real Git
preservation fixtures and native lifecycle/keyboard checks pass.
Expand Down Expand Up @@ -2814,6 +2820,36 @@ implementation rows while the July audit is labeled historical. This is a
planning update, not a claim that these features shipped; existing local Git,
GitHub/Azure review, Workbench and performance work retain their own status.

**Advanced refs and Git-flow shipped (2026-09-06):** Added lazy Git notes and
replacement-ref management, explicit unsigned tag retarget/re-annotation with
current/new target review and remote publication checks, and opt-in Git-flow
AVH configuration plus feature/release/hotfix start/finish. Stale external refs,
checkout/config changes and unresolved conflicts block reviewed writes.
Git-flow streams bounded output and preserves completed merges/tags when a
later merge is aborted. Native WebView2 exercised notes, replacements, tag
edits, all three workflow types, external-session recovery and keyboard focus.
The core suite passed (174 normal tests plus three explicit AVH integrations),
as did the frontend typecheck and five focused frontend tests.

---

**Patch interchange shipped (2026-09-06):** Added affected-path previews,
explicit index/worktree targets, validated import, original-author mailboxes
with Continue/Skip/Abort, and bundle verification/import/export with
prerequisite/ref summaries. Native fixtures cover stale previews, all patch
targets, mailbox authors/recovery and missing bundle prerequisites. Rust
checks, five fixtures and three frontend IPC tests pass. Native WebView2
verified palette/focus, worktree/index targets, mailbox authors and conflict
continuation, and bundle verification/import/incremental export.

**Guided bisect shipped (2026-09-06):** The Repository menu, palette and
operation banner open a manual bisect dialog backed by worktree-local Git
state. It shows remaining candidates, final/ambiguous outcomes, custom
external terms and no-checkout sessions. Stale ratings and dirty checkout/
reset transitions are refused. Three native fixtures, two frontend tests,
Rust checks/typecheck and native WebView2 rating/resume/reset/keyboard flows
pass. Automated test-command execution remains a separate later slice.

**Personal user actions shipped (2026-09-06, F15):** Settings → Integrations
now edits explicit executable/argv definitions for repositories, qualified refs,
and working-tree files. Context menus and Quick Launch capture the target and
Expand Down
20 changes: 14 additions & 6 deletions TASKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,12 @@ Detailed comparison and sequencing: [`docs/git-client-1.0-audit.md`](./docs/git-
ignored and nested files, unrecorded commits and `.gitmodules`/index
preservation fixtures pass. Native lifecycle, keyboard/palette, module
opening, destructive guards and cancellation checks pass.
- **F07 / P2 — Patch/mailbox/bundle import and interchange.** Build on exact
- **F07 / P2 — Patch/mailbox/bundle import and interchange.** Build on exact
patch export and hunk apply with preview/validation, explicit targets,
mailbox continue/skip/abort and bundle prerequisites/ref summaries.
Implemented (`interchange.rs`, `InterchangeDialog`, Repository menu/palette);
five native fixtures and three IPC tests pass. Native WebView2 verified patch
targets, authored mailbox/conflict continuation and bundle import/export.
- ☑ **F08 / P2 — Sparse checkout.** Cone-directory inspect/change/disable and
compatibility fixtures for excluded paths, dirty trees and sparse indexes
(`Repo::set_sparse_checkout`, `SparseCheckoutDialog`, `sparse_checkout.rs` fixtures).
Expand All @@ -127,21 +130,26 @@ Detailed comparison and sequencing: [`docs/git-client-1.0-audit.md`](./docs/git-
`repo_expand_history`, `CloneScopeDialog`; `docs/sparse-clone-verification.md`).
Follow-up: verify real LFS clone checkout on Git 2.45.1 / LFS 3.5.1;
see `docs/git-assets-validation-2026-09-06.md` for the hook rejection.
- **F10 / P2 — Guided bisect.** Good/bad/skip, operation progress, external
- **F10 / P2 — Guided bisect.** Good/bad/skip, operation progress, external
session resume and safe reset to the original checkout; defer test-command
execution until the manual workflow is complete.
execution (`bisect.rs`, `BisectDialog`, Repository menu/palette and banner;
three native fixtures, two frontend tests and native WebView2 keyboard,
external-resume, dirty-reset and original-target checks).
- ☐ **F14 / P2 — Publish a new hosted repository.** Provider/account/visibility
selection, concrete destination review, remote configuration and explicit
initial push, with recovery from partial failure.
- ☑ **F15 / P2 — User-defined repository/ref/file actions.** Safe executable/
argv templates, exact context, palette/menu discovery, preview, bounded output
and cancellation. (`UserActionsEditor`, `UserActionDialog`,
`repo_user_action_preview` / `repo_user_action_run`; personally persisted settings.)
- **F18 / P3 — Advanced refs.** Git notes/replace-ref management and explicit
- **F18 / P3 — Advanced refs.** Git notes/replace-ref management and explicit
tag retarget/re-annotation with current/new target review. Signed tags are F03;
existing local Review notes are separate from Git notes.
- ☐ **F19 / P3 — Git-flow orchestration.** Opt-in tool/config detection and
existing local Review notes are separate from Git notes. (`AdvancedRefsDialog`,
locked notes updates, replace refs and compare-and-swap tag edits; native verified.)
- ☑ **F19 / P3 — Git-flow orchestration.** Opt-in tool/config detection and
inspectable start/finish feature/release/hotfix flows with conflict recovery.
(`GitflowDialog`, AVH command review/streaming, locked opt-in configuration
and merge-only recovery; all three flows and stale state verified natively.)

Hosted-review F06/F11–F13 stay in the Pull requests backlog below. CLI/deep-link
F16 and remote-SSH F17 keep their existing Platform / CLI companion / Remote
Expand Down
Loading
Loading