A3: offer git's prepared merge message in the commit box
git.mergeMessage reads MERGE_MSG without its comment lines while a merge is in progress. The Changes window fills an empty box with it once per merge when conflicts show up, and again on vcs.commit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
95fd9b926f
commit
983319d8a3
7 changed files with 183 additions and 2 deletions
|
|
@ -49,6 +49,8 @@ let listeners: ((event: { payload: unknown }) => void)[];
|
|||
let gitStatus: unknown;
|
||||
/** Errors to throw, by command id. */
|
||||
let failures: Record<string, { code: string; message: string }>;
|
||||
/** What `git.mergeMessage` answers. */
|
||||
let mergeMessage: string | null;
|
||||
/** What `file.saveAll` answers. */
|
||||
let saveAll: unknown;
|
||||
/** Pinia of the current test. */
|
||||
|
|
@ -118,6 +120,7 @@ beforeEach(() => {
|
|||
mounted = [];
|
||||
failures = {};
|
||||
gitStatus = sampleStatus();
|
||||
mergeMessage = null;
|
||||
saveAll = { saved: [], failed: [], skipped: [] };
|
||||
Element.prototype.scrollIntoView = () => undefined;
|
||||
invoke.mockReset();
|
||||
|
|
@ -145,6 +148,8 @@ beforeEach(() => {
|
|||
return Promise.resolve(gitStatus);
|
||||
case "git.lastMessage":
|
||||
return Promise.resolve({ message: "Last subject\n\nLast body" });
|
||||
case "git.mergeMessage":
|
||||
return Promise.resolve({ message: mergeMessage });
|
||||
case "git.commit":
|
||||
return Promise.resolve({ commit: "fedcba9876543210", summary: String(args.params.message).split("\n")[0] });
|
||||
case "file.saveAll":
|
||||
|
|
@ -338,6 +343,32 @@ describe("the Changes store", () => {
|
|||
expect(callsOf("git.lastMessage")).toHaveLength(1);
|
||||
});
|
||||
|
||||
it("offers git's prepared merge message once while a merge has conflicts", async () => {
|
||||
const changes = useChangesStore(pinia);
|
||||
await changes.refresh();
|
||||
expect(callsOf("git.mergeMessage")).toHaveLength(0);
|
||||
mergeMessage = "Merge branch 'feature'";
|
||||
gitStatus = {
|
||||
...sampleStatus(),
|
||||
files: [{ path: "a.php", index: "conflicted", worktree: "conflicted" }],
|
||||
};
|
||||
await changes.refresh();
|
||||
await flushPromises();
|
||||
expect(callsOf("git.mergeMessage")).toHaveLength(1);
|
||||
expect(changes.message).toBe("Merge branch 'feature'");
|
||||
changes.message = "";
|
||||
await emit({ kind: "gitChanged", available: true, repo: null, filesChanged: true });
|
||||
expect(callsOf("git.mergeMessage")).toHaveLength(1);
|
||||
expect(changes.message).toBe("");
|
||||
changes.focusMessage();
|
||||
await flushPromises();
|
||||
expect(changes.message).toBe("Merge branch 'feature'");
|
||||
changes.message = "mine";
|
||||
changes.focusMessage();
|
||||
await flushPromises();
|
||||
expect(changes.message).toBe("mine");
|
||||
});
|
||||
|
||||
it("keeps the message when git refuses the commit", async () => {
|
||||
const changes = useChangesStore(pinia);
|
||||
await changes.refresh();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue