vedanshujain · Dec 21, 2022 · Dec 12, 2022 · Dec 12, 2022 · Dec 13, 2022 · Dec 13, 2022
@@ -0,0 +1,5 @@
+Significance: minor
+Type: changed
+
+Support merge strategy for jetpack changelogger, assuming that merge commits contains the pr number in the merge commit with format (#{pr_number}) towards the end.
+
@@ -55,7 +55,7 @@
 	"extra": {
 		"autotagger": true,
 		"branch-alias": {
-			"dev-trunk": "3.2.x-dev"
+			"dev-trunk": "3.3.x-dev"
 		},
 		"mirror-repo": "Automattic/jetpack-changelogger",
 		"version-constants": {

@@ -18,7 +18,7 @@
  */
 class Application extends SymfonyApplication {
 
-	const VERSION = '3.2.3';
+	const VERSION = '3.3.0-alpha';
 
 	/**
 	 * Constructor.

@@ -176,7 +176,7 @@ public static function getRepoData( $file, OutputInterface $output, DebugFormatt
 		);
 
 		try {
-			$process = self::runCommand( array( 'git', 'log', '-1', "--format=%cI\n%s", $file ), $output, $formatter );
+			$process = self::runCommand( array( 'git', 'log', '-1', '--first-parent', "--format=%cI\n%s", $file ), $output, $formatter );
 			if ( $process->isSuccessful() ) {
 				$cmd_output = explode( "\n", trim( $process->getOutput() ) );
 
@@ -188,10 +188,13 @@ public static function getRepoData( $file, OutputInterface $output, DebugFormatt
 				// PR number.
 				if ( isset( $cmd_output[1] ) ) {
 					$matches = array();
-					preg_match( '/\(#(\d+)\)$/', $cmd_output[1], $matches );
-					if ( isset( $matches[1] ) ) {
+					preg_match( '/(?:^Merge pull request #(\d+))|(?:\(#(\d+)\)$)/', $cmd_output[1], $matches );
+					if ( ! empty( $matches[1] ) ) {
 						$repo_data['pr-num'] = $matches[1];
 					}
+					if ( ! empty( $matches[2] ) ) {
+						$repo_data['pr-num'] = $matches[2];
+					}
 				}
 			}
 		// phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch

@@ -349,7 +349,7 @@ public function testLoadChangeFile_badFile() {
 	}
 
 	/**
-	 * Test getRepoData
+	 * Test getRepoData with squash and merge commits.
 	 */
 	public function testGetRepoData() {
 		$this->useTempDir();
@@ -389,10 +389,18 @@ public function testGetRepoData() {
 				),
 			),
 		);
-		Utils::runCommand( array( 'git', 'init', '.' ), ...$args );
+		Utils::runCommand( array( 'git', 'init', '-b', 'main', '.' ), ...$args );
 		Utils::runCommand( array( 'git', 'add', 'in-git.txt' ), ...$args );
 		Utils::runCommand( array( 'git', 'commit', '-m', 'Commit (#123)' ), ...$args );
 
+		// Let's create another branch, add a commit and merge to trunk.
+		Utils::runCommand( array( 'git', 'checkout', '-b', 'temp' ), ...$args );
+		file_put_contents( 'in-git2.txt', '' );
+		Utils::runCommand( array( 'git', 'add', 'in-git2.txt' ), ...$args );
+		Utils::runCommand( array( 'git', 'commit', '-m', 'Dummy commit message.' ), ...$args );
+		Utils::runCommand( array( 'git', 'checkout', 'main' ), ...$args );
+		Utils::runCommand( array( 'git', 'merge', 'temp', '--no-ff', '-m', 'Merge pull request #124 from temp.' ), ...$args );
+
 		$this->assertSame(
 			array(
 				'timestamp' => '2021-02-02T22:22:22+00:00',
@@ -401,6 +409,15 @@ public function testGetRepoData() {
 			Utils::getRepoData( 'in-git.txt', $output, $helper )
 		);
 
+		// Test the second commit.
+		$this->assertSame(
+			array(
+				'timestamp' => '2021-02-02T22:22:22+00:00',
+				'pr-num'    => '124',
+			),
+			Utils::getRepoData( 'in-git2.txt', $output, $helper )
+		);
+
 		// Test our non-git file again.
 		$this->assertSame(
 			array(

diff --git a/projects/plugins/backup/changelog/changelogger-merge b/projects/plugins/backup/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/beta/changelog/changelogger-merge b/projects/plugins/beta/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/debug-helper/changelog/changelogger-merge b/projects/plugins/debug-helper/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock
diff --git a/projects/plugins/jetpack-mu-wpcom/changelog/changelogger-merge b/projects/plugins/jetpack-mu-wpcom/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/jetpack-mu-wpcom/composer.lock b/projects/plugins/jetpack-mu-wpcom/composer.lock
diff --git a/projects/plugins/jetpack/changelog/changelogger-merge b/projects/plugins/jetpack/changelog/changelogger-merge
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Also support git merge strategy for changelog.'
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/protect/changelog/changelogger-merge b/projects/plugins/protect/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
diff --git a/projects/plugins/search/changelog/changelogger-merge b/projects/plugins/search/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
diff --git a/projects/plugins/social/changelog/changelogger-merge b/projects/plugins/social/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
diff --git a/projects/plugins/starter-plugin/changelog/changelogger-merge b/projects/plugins/starter-plugin/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
diff --git a/projects/plugins/super-cache/changelog/changelogger-merge b/projects/plugins/super-cache/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock
diff --git a/projects/plugins/vaultpress/changelog/changelogger-merge b/projects/plugins/vaultpress/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+
diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock
diff --git a/projects/plugins/videopress/changelog/changelogger-merge b/projects/plugins/videopress/changelog/changelogger-merge
@@ -0,0 +1,5 @@
+Significance: patch
+Type: added
+Comment: Minor update to changelog package that supports git merge strategy. Should not affect shipped code.
+
+