M4.5: branch status-bar item and branches popup
The status bar shows the current branch (short hash when detached). Its popup lists local, then remote branches with a filter and New branch; checkout runs flushDirty first and toasts git's refusal. Commands vcs.branches, vcs.newBranch and vcs.checkout. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
b3642e53ea
commit
149a6c7049
18 changed files with 1585 additions and 17 deletions
|
|
@ -19,7 +19,10 @@
|
|||
"command.settings.open": "Settings…",
|
||||
"command.terminal.open": "Terminal",
|
||||
"command.unavailable": "{command} cannot run right now",
|
||||
"command.vcs.branches": "Branches…",
|
||||
"command.vcs.checkout": "Check Out Branch",
|
||||
"command.vcs.commit": "Commit…",
|
||||
"command.vcs.newBranch": "New Branch…",
|
||||
"command.vcs.nextChange": "Next Change",
|
||||
"command.vcs.openChanges": "Changes",
|
||||
"command.vcs.previousChange": "Previous Change",
|
||||
|
|
@ -152,8 +155,13 @@
|
|||
"notification.toolchain.downloadFailed": "Phpactor {version} could not be downloaded: {reason}",
|
||||
"notification.toolchain.downloadStarted": "Downloading Phpactor {version} from GitHub for PHP language features…",
|
||||
"notification.toolchain.phpMissing": "PHP language features need PHP {min} or newer: {reason}. Install PHP or set the PHP executable in Settings.",
|
||||
"notification.vcs.branchCreated": "Created branch {branch}",
|
||||
"notification.vcs.checkedOut": "Checked out {branch}",
|
||||
"notification.vcs.checkoutFailed": "Git did not check out {branch}: {reason}",
|
||||
"notification.vcs.checkoutNotSaved": "Checkout of {branch} cancelled: not every file could be saved first.",
|
||||
"notification.vcs.commitNotSaved": "Commit cancelled: not every file could be saved first.",
|
||||
"notification.vcs.committed": "Committed {hash}: {summary}",
|
||||
"notification.vcs.newBranchFailed": "Branch {branch} was not created: {reason}",
|
||||
"notification.vfs.pumpFailed": "Applying changes on disk failed: {reason}",
|
||||
"notification.watch.failed": "Lutra stopped watching the project for changes on disk: {reason}",
|
||||
"palette.label": "Command palette",
|
||||
|
|
@ -273,6 +281,21 @@
|
|||
"terminal.toolWindow.title": "Terminal",
|
||||
"theme.lutraDark": "Lutra Dark",
|
||||
"theme.lutraLight": "Lutra Light",
|
||||
"vcs.branchItem.detached": "Detached HEAD at {hash}. Click for branches.",
|
||||
"vcs.branchItem.label": "Git branch {branch}. Click for branches.",
|
||||
"vcs.branches.create": "Create",
|
||||
"vcs.branches.current": "current",
|
||||
"vcs.branches.filter": "Filter branches",
|
||||
"vcs.branches.label": "Branches",
|
||||
"vcs.branches.loadFailed": "The branches cannot be read: {reason}",
|
||||
"vcs.branches.loading": "Reading branches…",
|
||||
"vcs.branches.local": "Local",
|
||||
"vcs.branches.nameEmpty": "Enter a name for the branch.",
|
||||
"vcs.branches.new": "New branch…",
|
||||
"vcs.branches.newCheckout": "Check out",
|
||||
"vcs.branches.newName": "Name of the new branch",
|
||||
"vcs.branches.noMatches": "No branch matches",
|
||||
"vcs.branches.remote": "Remote",
|
||||
"vcs.changes.clean": "{branch}: no changes",
|
||||
"vcs.changes.group.changes": "Changes",
|
||||
"vcs.changes.group.staged": "Staged",
|
||||
|
|
@ -292,6 +315,7 @@
|
|||
"vcs.changes.unavailableHint": "Install Git 2.30 or newer, or set the Git executable in Settings.",
|
||||
"vcs.changes.unstageAll": "Unstage all",
|
||||
"vcs.changes.unstageFile": "Unstage {path}",
|
||||
"vcs.checkout.invalidParams": "vcs.checkout needs a branch name (params: branch).",
|
||||
"vcs.commit.amend": "Amend",
|
||||
"vcs.commit.amendButton": "Amend Commit",
|
||||
"vcs.commit.button": "Commit",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue