mirror of
https://github.com/l0ng-ai/openidea.git
synced 2026-11-08 08:52:12 +00:00
l0ng-ai
eb67595e72
- Settings › Commit › "Use non-modal commit interface": when off, Local Changes, Shelf and Stash become tabs of the Git tool window and ⌘K opens a Commit dialog; switches live. - Git tool window: Worktrees tab; Show History and Show Git Log for a branch open their own closable tabs instead of changing the Log filters. - Log: toolbar and context menu for a commit's changed files, vertical toolbar, Tags node and hiding for the branches pane, Collapse / Expand Linear Branches as separate actions, and a Version Control › Log page. - Branch popup: collapsible groups, branches grouped by prefix, an options menu behind the gear, incoming / outgoing icons and "Pull into … Using Rebase / Merge"; New Branch on ⌥⌘N outside the editor. - Git main menu regrouped with Uncommitted Changes and Current File submenus; rebase / merge controls enabled only while one is in progress. - Settings: Version Control lists its pages; new options for clearing the initial commit message, showing Update options, confirming dropped commits, revealing created patches, large-file and file-name warnings, the Push dialog after Commit and Push, combined stashes and shelves, and removing applied files from the shelf.
63 lines
2.9 KiB
TypeScript
63 lines
2.9 KiB
TypeScript
/**
|
||
* Where committing happens: the Commit tool window (non-modal commit interface) or
|
||
* the Commit dialog with the local changes in the Git tool window (modal one,
|
||
* Settings › Version Control › Commit). Also the push that follows Commit and Push….
|
||
*/
|
||
import { workflowSettings, type GitSettingsValid } from "@/platform/workflowSettings";
|
||
import { toolWindowService } from "@/workbench/contributions";
|
||
import { useCommit, type CommitTab } from "./commitStore";
|
||
import { stashTabOf } from "./gitTabs";
|
||
import { selectGitTab } from "./logStore";
|
||
import { isProtectedBranch, pushWithAutoUpdate, showPushDialog } from "./remoteUi";
|
||
import { refreshNow, useVcs } from "./store";
|
||
|
||
export const isModalCommit = () => !workflowSettings().vcs.commit.nonModal;
|
||
|
||
/** Shows the local changes, Shelf or Stash tab wherever the commit interface puts them. */
|
||
export function showLocalChanges(tab: CommitTab = "changes", focus = true) {
|
||
const target = stashTabOf(tab, workflowSettings().vcs.git.combineStashAndShelf);
|
||
if (isModalCommit()) {
|
||
selectGitTab(target);
|
||
toolWindowService().show("git", focus);
|
||
return;
|
||
}
|
||
useCommit.setState((s) => ({ tab: target, focusTick: tab === "changes" ? s.focusTick + 1 : s.focusTick }));
|
||
toolWindowService().show("commit", focus);
|
||
}
|
||
|
||
/** Commit… (⌘K): focuses the commit message of the Commit window, or opens the Commit dialog. */
|
||
export function openCommit() {
|
||
if (!isModalCommit()) return showLocalChanges("changes");
|
||
void import("./CommitDialog").then((m) => m.showCommitDialog());
|
||
}
|
||
|
||
/**
|
||
* Commit and Push…: whether the Push dialog comes up after the commit (Settings › Git ›
|
||
* "Show Push dialog for Commit and Push", optionally only for protected branches) or
|
||
* the branch is pushed right away. `target` is the remote branch pushed to (null: none
|
||
* can be told, e.g. a detached HEAD, which always needs the dialog).
|
||
*/
|
||
export function pushDialogNeeded(
|
||
git: Pick<GitSettingsValid, "showPushDialog" | "pushDialogOnlyProtected" | "protectedBranches">,
|
||
target: string | null,
|
||
): boolean {
|
||
if (!target) return true;
|
||
if (!git.showPushDialog) return false;
|
||
return !git.pushDialogOnlyProtected || isProtectedBranch(target, git.protectedBranches);
|
||
}
|
||
|
||
/** After Commit and Push…: the Push dialog, or a push of the current branch. */
|
||
export async function pushAfterCommit() {
|
||
await refreshNow();
|
||
const { branch, roots } = useVcs.getState();
|
||
const head = branch?.head ?? null;
|
||
const upstream = branch?.upstream ?? null;
|
||
const target = upstream ? upstream.slice(upstream.indexOf("/") + 1) : head;
|
||
// Several repositories: which of them to push is chosen in the dialog.
|
||
if (roots.length > 1 || pushDialogNeeded(workflowSettings().vcs.git, target)) return showPushDialog();
|
||
await pushWithAutoUpdate(
|
||
{ op: "push", force_with_lease: false, set_upstream: !upstream, tags: null },
|
||
upstream ? `${head} → ${upstream}` : `${head} → new remote branch`,
|
||
);
|
||
}
|