feat(git-graph): VS Code-style git graph with commit actions in History modal (#1431)
* feat(types): add parents to GitLogEntry and new commit action types
* feat(git): add parent hashes and --all flag to getLog
* fix(git): move record separator to start of log format string
* feat(git): add checkoutCommit server function and route
* feat(git): add cherryPick server function and route
* feat(git): add revertCommit server function and route
* feat(git): add resetToCommit server function and route
* fix(tests): make git service tests branch-name portable, add error path tests
* feat(client): add checkoutCommit, cherryPick, revertCommit, resetToCommit API wrappers
* feat(git-graph): add lane assignment algorithm with tests
* feat(git-graph): add GitGraphSegment per-row SVG renderer
* feat(i18n): add locale strings for git graph action buttons
* fix(git-graph): handle lane convergence, fix SVG path coords, add connector tests
* feat(git-graph): add ref badges and action buttons to HistoryCommitRow
* fix(git-graph): add loading guards to reset actions, use theme tokens for ref badges
* fix(git-graph): conditional hooks, stale graph log, conflict handling, i18n
* fix(types): replace toBeDefined with toBeTruthy, fix toast API usage
* fix(lint): remove unused variables
* fix(git-graph): fix SVG height causing 150px row spacing
* fix(git-graph): smooth bezier curves, fill row height, round line caps
* fix(git-graph): non-scaling-stroke fixes bezier white spaces, sort curves on top
* fix(git-graph): remove viewBox scaling, match SVG height to actual row height
* fix(git-graph): ResizeObserver tracks actual row height, eliminates SVG height mismatch
* feat(git-graph): replace SVG with Canvas for graph rendering
* fix(git-graph): isolate canvas from flex layout to prevent replaced-element height leak
* feat(git-graph): align action buttons, add confirmation popups for all actions
* fix(git-graph): address code review findings CR-001 through CR-005
- CR-001: VS Code getGitLog now forwards 'all' option and parses %P parents
- CR-002: VS Code bridge/gitService implement checkoutCommit, cherryPick,
revertCommit, resetToCommit with conflict detection and hard-reset guard
- CR-003: server-side commit hash validated with /^[0-9a-fA-F]{7,40}$/
in both routes.js and service.js; 12 new rejection tests added
- CR-004: cherry-pick/revert conflict path now refreshes fetchStatus/
fetchBranches/fetchLog; conflict toast uses i18n keys in all 7 locales
- CR-005: corrected O(n) comment to O(n x lanes)
* fix(i18n): add zh-TW locale and common.language.traditionalChinese key to all locales
upstream/main added zh-TW.ts after branch diverged; CI type-check fails
when PR is merged because zh-TW.ts was missing all gitView.history.actions.*
keys and loadMore/loadingMore. Also adds common.language.traditionalChinese
to en.ts and all 6 non-English files to match upstream en.ts.
* fix: harden git history actions
* feat: split git history graph view
* chore: remove git graph planning docs
---------
Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
This commit is contained in:
committed by
GitHub
co-authored by
Bohdan Triapitsyn
parent
cc3d1bd63c
commit
52ffe9daef
@@ -1491,11 +1491,39 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.header.identityTooltip': 'Git identity',
|
||||
'gitView.header.noIdentity': 'No identity',
|
||||
'gitView.header.noProfiles': 'No profiles available to apply.',
|
||||
'gitView.header.repositoryViews': 'Widoki repozytorium',
|
||||
'gitView.header.removeRemoteAria': 'Remove Remote aria label',
|
||||
'gitView.header.removeRemoteTitle': 'Remove Remote Title',
|
||||
'gitView.header.upstreamSynced': 'zsynchronizowano',
|
||||
'gitView.header.upstreamTooltip': 'Porównano z {target}.',
|
||||
'gitView.header.upstreamTooltipTracking': 'Porównano z {target}. Główne wskaźniki synchronizacji nadal odzwierciedlają {tracking}.',
|
||||
'gitView.history.actions.cancelButton': 'Anuluj',
|
||||
'gitView.history.actions.checkoutConfirm': 'Przełączyć na ten commit jako detached HEAD?',
|
||||
'gitView.history.actions.cherryPickConfirm': 'Wykonać cherry-pick tego commitu na bieżącą gałąź?',
|
||||
'gitView.history.actions.conflictToastDescription': 'Konflikty w: {files}. Rozwiąż je ręcznie i wykonaj commit albo przerwij przez git cherry-pick/revert --abort.',
|
||||
'gitView.history.actions.conflictToastTitle': 'Konflikt',
|
||||
'gitView.history.actions.confirmButton': 'Potwierdź',
|
||||
'gitView.history.actions.mergeConfirm': 'Scalić ten commit z bieżącą gałęzią?',
|
||||
'gitView.history.actions.rebaseConfirm': 'Przebazować bieżącą gałąź na ten commit?',
|
||||
'gitView.history.actions.resetHardConfirm': 'Hard reset — HEAD zostanie przesunięty, a wszystkie niezatwierdzone zmiany trwale usunięte.',
|
||||
'gitView.history.actions.resetMixedConfirm': 'Mixed reset — HEAD zostanie przesunięty, a zmiany zostaną usunięte ze stage.',
|
||||
'gitView.history.actions.resetSoftConfirm': 'Soft reset — HEAD zostanie przesunięty, a staged zmiany zostaną zachowane.',
|
||||
'gitView.history.actions.revertConfirm': 'Przygotować revert tego commitu?',
|
||||
'gitView.history.actions.checkout': 'Checkout',
|
||||
'gitView.history.actions.cherryPick': 'Cherry-pick',
|
||||
'gitView.history.actions.createBranch': 'Utwórz gałąź tutaj',
|
||||
'gitView.history.actions.createBranchConfirm': 'Utwórz',
|
||||
'gitView.history.actions.createBranchPlaceholder': 'Nazwa gałęzi',
|
||||
'gitView.history.actions.detachedHead': 'Checkout wykonany (detached HEAD)',
|
||||
'gitView.history.actions.merge': 'Scal z bieżącą',
|
||||
'gitView.history.actions.rebase': 'Rebase na ten commit',
|
||||
'gitView.history.actions.reset': 'Reset...',
|
||||
'gitView.history.actions.resetHard': 'Hard — usuń wszystkie zmiany',
|
||||
'gitView.history.actions.resetHardConfirmButton': 'Usuń zmiany',
|
||||
'gitView.history.actions.resetMixed': 'Mixed — usuń ze stage',
|
||||
'gitView.history.actions.resetSoft': 'Soft — zachowaj staged',
|
||||
'gitView.history.actions.revert': 'Revert',
|
||||
|
||||
'gitView.history.binary': 'Binary',
|
||||
'gitView.history.binaryNoDiff': 'Binary file — no diff available',
|
||||
'gitView.history.commitsPlaceholder': 'Commits Placeholder',
|
||||
@@ -1506,6 +1534,8 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.history.largeDiffTitle': 'Large diff ({count} changed lines)',
|
||||
'gitView.history.loadingDiff': 'Loading diff...',
|
||||
'gitView.history.loadingFiles': 'Loading files...',
|
||||
'gitView.history.loadMore': 'Załaduj więcej',
|
||||
'gitView.history.loadingMore': 'Ładowanie...',
|
||||
'gitView.history.logSize100': 'Log Size100',
|
||||
'gitView.history.logSize25': 'Log Size25',
|
||||
'gitView.history.logSize50': 'Log Size50',
|
||||
@@ -1514,6 +1544,7 @@ export const dict: Record<I18nKey, string> = {
|
||||
'gitView.history.renamedNoDiff': 'Renamed file — diff not supported',
|
||||
'gitView.history.renderDiffAnyway': 'Render anyway',
|
||||
'gitView.history.title': 'History',
|
||||
'gitView.graph.title': 'Graf',
|
||||
'gitView.integrate.checking': 'Sprawdzanie…',
|
||||
'gitView.integrate.cherryPickAbortedToast': 'Cherry-pick został przerwany',
|
||||
'gitView.integrate.cherryPickConflictDescription': 'Wykryto konflikt podczas cherry-pick.',
|
||||
|
||||
Reference in New Issue
Block a user