Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion src/extractors.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { extractBranchNameFromMergeMessage } from "./git";
import { verbose } from "./log";
import { CommitContext } from "./types";

Expand Down Expand Up @@ -275,6 +276,15 @@ export function extractLinearIssueIdentifiersForCommit(
);
}

const revertedMerge = parseRevertedMergeBranch(commit.message ?? "");
if (revertedMerge && revertedMerge.depth % 2 === 0) {
for (const match of matchAllIdentifiers(revertedMerge.inner)) {
if (!found.has(match.identifier)) {
found.set(match.identifier, { identifier: match.identifier, source: "commit_message" });
}
}
}

// In a revert, the inner subject's identifiers are reverted, not added — but
// the revert author's body (e.g. `Fixes LIN-N`) describes what the revert
// itself closes, so scan that. Strip squash dumps first to avoid attributing
Expand Down Expand Up @@ -470,6 +480,16 @@ function parseRevertMessage(message: string): {
return { depth, inner: text, afterTitle: outerAfter + body };
}

/** Branch and combined revert depth for `Revert "Merge pull request #N from org/branch"`, or null. */
function parseRevertedMergeBranch(message: string): { depth: number; inner: string } | null {
const { depth: messageDepth, inner } = parseRevertMessage(message);
if (messageDepth === 0) return null;
const branch = extractBranchNameFromMergeMessage(inner);
if (!branch) return null;
const { depth: branchDepth, inner: strippedBranch } = parseRevertBranch(branch);
return { depth: messageDepth + branchDepth, inner: strippedBranch };
}

/**
* Unwrap Revert "..." layers from a commit message and count nesting depth.
* e.g. 'Revert "Revert "DRIVE-320: Fix""' → { depth: 2, inner: "DRIVE-320: Fix" }
Expand Down Expand Up @@ -501,11 +521,22 @@ export function extractRevertedIssueIdentifiersForCommit(commit: CommitContext):
const { depth: branchDepth, inner: originalBranch } = parseRevertBranch(commit.branchName ?? "");
const { depth: messageDepth, inner: innerMessage } = parseRevertMessage(commit.message ?? "");

const revertedMerge = parseRevertedMergeBranch(commit.message ?? "");
const revertsMergedBranch = revertedMerge !== null && revertedMerge.depth % 2 === 1;

// At least one of branch/message must have odd depth (i.e., be a revert) to extract
if (branchDepth % 2 === 0 && messageDepth % 2 === 0) return [];
if (branchDepth % 2 === 0 && messageDepth % 2 === 0 && !revertsMergedBranch) return [];

const found = new Map<string, ExtractedIdentifier>();

if (revertsMergedBranch) {
for (const match of matchAllIdentifiers(revertedMerge.inner)) {
if (!found.has(match.identifier)) {
found.set(match.identifier, { identifier: match.identifier, source: "commit_message" });
}
}
}

if (branchDepth % 2 === 1) {
for (const match of matchAllIdentifiers(originalBranch)) {
if (!found.has(match.identifier)) {
Expand Down
4 changes: 4 additions & 0 deletions src/git.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ describe("extractBranchNameFromMergeMessage", () => {
it("should return null for non-merge messages", () => {
expect(extractBranchNameFromMergeMessage("Some regular commit")).toBeNull();
expect(extractBranchNameFromMergeMessage("Fix bug (#123)")).toBeNull();
expect(
extractBranchNameFromMergeMessage("Big change (#9)\n\n* Merge pull request #5 from org/eng-5-old"),
).toBeNull();
expect(extractBranchNameFromMergeMessage('Revert "Merge pull request #5 from org/eng-5-old"')).toBeNull();
});

it("should return null for null or undefined input", () => {
Expand Down
6 changes: 3 additions & 3 deletions src/git.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,17 +367,17 @@ export function extractBranchNameFromMergeMessage(message: string | null | undef
return null;
}
// GitHub: "Merge pull request #123 from owner/branch-name"
const githubMatch = message.match(/Merge pull request #\d+ from [^/]+\/(\S+)/i);
const githubMatch = message.match(/^Merge pull request #\d+ from [^/\s]+\/(\S+)/i);
if (githubMatch?.[1]) {
return githubMatch[1];
}
// GitLab: "Merge branch 'branch-name' into 'target'" or "Merge branch 'branch-name'"
const gitlabMatch = message.match(/Merge branch '([^']+)'/i);
const gitlabMatch = message.match(/^Merge branch '([^']+)'/i);
if (gitlabMatch?.[1]) {
return gitlabMatch[1];
}
// Bitbucket: "Merged in feature/ENG-123-fix-auth (pull request #42)"
const bitbucketMatch = message.match(/Merged in (\S+) \(pull request #\d+\)/i);
const bitbucketMatch = message.match(/^Merged in (\S+) \(pull request #\d+\)/i);
return bitbucketMatch?.[1] ?? null;
}

Expand Down
50 changes: 50 additions & 0 deletions src/scan.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { describe, expect, it, vi } from "vitest";
import { extractBranchNameFromMergeMessage } from "./git";
import * as log from "./log";
import { scanCommits } from "./scan";
import { CommitContext } from "./types";
Expand Down Expand Up @@ -81,6 +82,55 @@ describe("scanCommits", () => {
});
});

describe("git revert of a merge commit", () => {
const merge = "Merge pull request #123 from org/user/eng-100-add-thing\n\nAdd thing";
const revert =
'Revert "Merge pull request #123 from org/user/eng-100-add-thing"\n\nThis reverts commit aaaa, reversing\nchanges made to bbbb.';
const commit = (sha: string, message: string): CommitContext => ({
sha,
message,
branchName: extractBranchNameFromMergeMessage(message),
});

it("reverts the merged branch's identifier", () => {
const result = scanCommits([commit("r1", revert)], {});
expect(ids(result.issueReferences)).toEqual([]);
expect(ids(result.revertedIssueReferences)).toEqual(["ENG-100"]);
expect(result.prNumbers).toEqual([]);
});

it("reverts when the revert is squash-merged", () => {
const result = scanCommits(
[commit("r1", 'Revert "Merge pull request #123 from org/user/eng-100-add-thing" (#456)')],
{},
);
expect(ids(result.issueReferences)).toEqual([]);
expect(ids(result.revertedIssueReferences)).toEqual(["ENG-100"]);
});

it("reverts when the merge and its revert ship together", () => {
const result = scanCommits([commit("a1", merge), commit("r1", revert)], {});
expect(ids(result.issueReferences)).toEqual([]);
expect(ids(result.revertedIssueReferences)).toEqual(["ENG-100"]);
});

it("re-adds on a revert of the revert", () => {
const reRevert = `Revert "${revert.split("\n")[0]}"\n\nThis reverts commit cccc.`;
const result = scanCommits([commit("ra1", reRevert)], {});
expect(ids(result.issueReferences)).toEqual(["ENG-100"]);
expect(ids(result.revertedIssueReferences)).toEqual([]);
});

it("re-adds on a revert of a revert PR's merge", () => {
const result = scanCommits(
[commit("ra1", 'Revert "Merge pull request #456 from org/revert-123-user/eng-100-add-thing"')],
{},
);
expect(ids(result.issueReferences)).toEqual(["ENG-100"]);
expect(ids(result.revertedIssueReferences)).toEqual([]);
});
});

describe("last-write-wins edge cases", () => {
it("separates different issues into added and reverted lists", () => {
const commits: CommitContext[] = [
Expand Down
Loading