feat: enable first-parent commits filtering by cli flag

bin/cli.js

@@ -11,6 +11,7 @@ const cli = meow(
   Options
     --sequential-init  Avoid hypothetical concurrent initialization collisions.
     --debug Output debugging information.
+    --first-parent Apply commit filtering to current branch only.
     --help Help info.
 
   Examples
@@ -21,6 +22,9 @@ const cli = meow(
 			sequentialInit: {
 				type: "boolean",
 			},
+			firstParent: {
+				type: "boolean",
+			},
 			debug: {
 				type: "boolean",
 			},

lib/createInlinePluginCreator.js

@@ -11,11 +11,12 @@ const hasChangedDeep = require("./hasChangedDeep");
  * @param {Package[]} packages The multi-semantic-release context.
  * @param {MultiContext} multiContext The multi-semantic-release context.
  * @param {Synchronizer} synchronizer Shared synchronization assets
+ * @param {Object} flags argv options
  * @returns {Function} A function that creates an inline package.
  *
  * @internal
  */
-function createInlinePluginCreator(packages, multiContext, synchronizer) {
+function createInlinePluginCreator(packages, multiContext, synchronizer, flags) {
 	// Vars.
 	const { cwd } = multiContext;
 	const { todo, waitFor, waitForAll, emit, getLucky } = synchronizer;
@@ -109,9 +110,10 @@ function createInlinePluginCreator(packages, multiContext, synchronizer) {
 		 * @internal
 		 */
 		const analyzeCommits = async (pluginOptions, context) => {
+			const filterParentBranch = flags.filterParent ? context.branch.name : undefined;
+
 			// Filter commits by directory.
-			commits = await getCommitsFiltered(cwd, dir, context.lastRelease.gitHead, context.branch.name);
-			// context.logger.log("filtered commits", JSON.stringify(commits, null, 2));
+			commits = await getCommitsFiltered(cwd, dir, context.lastRelease.gitHead, filterParentBranch);
 
 			// Set context.commits so analyzeCommits does correct analysis.
 			context.commits = commits;

lib/getCommitsFiltered.js

@@ -15,10 +15,10 @@ const debug = require("debug")("msr:commitsFilter");
  * @param {string} cwd Absolute path of the working directory the Git repo is in.
  * @param {string} dir Path to the target directory to filter by. Either absolute, or relative to cwd param.
  * @param {string|void} lastHead The SHA of the previous release
- * @param {string|void} branch first-parent to determine which merges went into master
+ * @param {string|void} firstParentBranch first-parent to determine which merges went into master
  * @return {Promise<Array<Commit>>} The list of commits on the branch `branch` since the last release.
  */
-async function getCommitsFiltered(cwd, dir, lastHead = undefined, branch = "master") {
+async function getCommitsFiltered(cwd, dir, lastHead = undefined, firstParentBranch) {
 	// Clean paths and make sure directories exist.
 	check(cwd, "cwd: directory");
 	check(dir, "dir: path");
@@ -44,7 +44,8 @@ async function getCommitsFiltered(cwd, dir, lastHead = undefined, branch = "mast
 
 	// Use git-log-parser to get the commits.
 	const relpath = relative(root, dir);
-	const gitLogFilterQuery = ["--first-parent", branch, lastHead ? `${lastHead}..HEAD` : "HEAD", "--", relpath];
+	const firstParentBranchFilter = firstParentBranch ? ["--first-parent", firstParentBranch] : [];
+	const gitLogFilterQuery = [...firstParentBranchFilter, lastHead ? `${lastHead}..HEAD` : "HEAD", "--", relpath];
 	const stream = gitLogParser.parse({ _: gitLogFilterQuery }, { cwd, env: process.env });
 	const commits = await getStream.array(stream);
 

lib/multiSemanticRelease.js

@@ -77,7 +77,7 @@ async function multiSemanticRelease(
 	const { getLucky, waitFor } = synchronizer;
 
 	// Release all packages.
-	const createInlinePlugin = createInlinePluginCreator(packages, multiContext, synchronizer);
+	const createInlinePlugin = createInlinePluginCreator(packages, multiContext, synchronizer, flags);
 	await Promise.all(
 		packages.map(async (pkg) => {
 			// Avoid hypothetical concurrent initialization collisions / throttling issues.