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.
97 lines
3.0 KiB
TypeScript
97 lines
3.0 KiB
TypeScript
/**
|
||
* Commit dialog of the modal commit interface (Settings › Version Control › Commit ›
|
||
* "Use non-modal commit interface" off): the changes with inclusion checkboxes and
|
||
* the Commit Options beside them, the message below. Commits through the same
|
||
* pipeline as the Commit tool window.
|
||
*/
|
||
import { tx } from "@/platform/i18n";
|
||
import { Dialog, SplitGroup, SplitHandle, SplitPanel } from "@/ui";
|
||
import { CommitOptionsBody } from "./CommitOptions";
|
||
import { useCommit } from "./commitStore";
|
||
import {
|
||
ChangesTree,
|
||
CommitMessageField,
|
||
commitAndPushLabel,
|
||
commitLabel,
|
||
useCommitRunner,
|
||
useIncludedCount,
|
||
} from "./CommitView";
|
||
import { openDialog } from "./dialogs";
|
||
import { useVcs } from "./store";
|
||
import viewStyles from "./CommitView.module.css";
|
||
import styles from "./CommitDialog.module.css";
|
||
|
||
let open = false;
|
||
|
||
/** Opens the Commit dialog (or focuses the message of the one open). */
|
||
export function showCommitDialog() {
|
||
useCommit.setState((s) => ({ tab: "changes", focusTick: s.focusTick + 1 }));
|
||
if (open) return;
|
||
open = true;
|
||
openDialog((close) => (
|
||
<CommitDialog
|
||
onClose={() => {
|
||
open = false;
|
||
close();
|
||
}}
|
||
/>
|
||
));
|
||
}
|
||
|
||
function CommitDialog({ onClose }: { onClose: () => void }) {
|
||
const included = useIncludedCount();
|
||
const amend = useCommit((s) => s.amend);
|
||
const problems = useCommit((s) => s.checkProblems.length > 0);
|
||
const remoteBusy = useVcs((s) => s.remoteBusy);
|
||
const runner = useCommitRunner(included, onClose);
|
||
return (
|
||
<Dialog
|
||
open
|
||
title="Commit Changes"
|
||
onClose={onClose}
|
||
width={880}
|
||
buttons={[
|
||
{
|
||
label: commitLabel(amend, problems),
|
||
role: "default",
|
||
disabled: !runner.canCommit,
|
||
title: "⌘↩",
|
||
onClick: () => void runner.run(false),
|
||
},
|
||
{
|
||
label: commitAndPushLabel(amend),
|
||
role: "extra",
|
||
disabled: !runner.canCommit || !!remoteBusy,
|
||
title: "⌥⌘↩",
|
||
onClick: () => void runner.run(true),
|
||
},
|
||
{ label: "Cancel", role: "cancel" },
|
||
]}
|
||
>
|
||
<div className={styles.body}>
|
||
<SplitGroup orientation="vertical" className={styles.split}>
|
||
<SplitPanel defaultSize="58%" minSize="25%">
|
||
<SplitGroup orientation="horizontal" className={styles.split}>
|
||
<SplitPanel defaultSize="64%" minSize="35%">
|
||
<ChangesTree mode="dialog" />
|
||
</SplitPanel>
|
||
<SplitHandle />
|
||
<SplitPanel defaultSize="36%" minSize="200px">
|
||
<div className={styles.options} role="group" aria-label={tx("Commit Options")}>
|
||
<CommitOptionsBody />
|
||
</div>
|
||
</SplitPanel>
|
||
</SplitGroup>
|
||
</SplitPanel>
|
||
<SplitHandle />
|
||
<SplitPanel defaultSize="42%" minSize="120px">
|
||
<div className={viewStyles.commit}>
|
||
<CommitMessageField included={included} runner={runner} />
|
||
</div>
|
||
</SplitPanel>
|
||
</SplitGroup>
|
||
</div>
|
||
</Dialog>
|
||
);
|
||
}
|