mirror of
https://github.com/expo/fbshipit.git
synced 2026-11-15 17:33:57 -10:00
Summary: Currently, the stripping of the file list from Git messages only works for messages that include a summary. For instance: ``` This is my Git message title. Some summary for my git commit. -- [ file list here ] ``` However, when syncing commits that only have a single line, and have no commit message, the file list is included because it can't find a new line prior to the "---". This commit replaces this functionality to include a regex that looks at the beginning of the message, and then does a substr to determine the commit message. Closes https://github.com/facebook/fbshipit/pull/13 Differential Revision: D3394057 Pulled By: fredemmott fbshipit-source-id: 443d6af7afcee18a2c6aaf54b3dbb7fee046a416
133 lines
3.7 KiB
PHP
133 lines
3.7 KiB
PHP
<?hh
|
|
/**
|
|
* Copyright (c) 2016-present, Facebook, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under the BSD-style license found in the
|
|
* LICENSE file in the root directory of this source tree. An additional grant
|
|
* of patent rights can be found in the PATENTS file in the same directory.
|
|
*/
|
|
namespace Facebook\ShipIt;
|
|
|
|
final class UnusualContentTest extends BaseTest {
|
|
public function examplesForRemovingFile(
|
|
): array<(string, string, string, string)> {
|
|
return [
|
|
tuple(
|
|
__DIR__.'/git-diffs/remove-file-with-hyphen-line.patch',
|
|
'pre-hyphen',
|
|
"\n--\n",
|
|
'post-hyphen',
|
|
),
|
|
tuple(
|
|
__DIR__.'/git-diffs/remove-file-with-hyphen-space-line.patch',
|
|
'pre hyphen space',
|
|
"\n-- \n",
|
|
'after hyphen space',
|
|
),
|
|
];
|
|
}
|
|
|
|
/** If a file contains '-', removing it creates a patch containing
|
|
* just '--' as a line - this kind-of-looks-like (and has been incorrectly
|
|
* interpreted as) a section separator instead of content, forming
|
|
* an invalid patch.
|
|
*
|
|
* @dataProvider examplesForRemovingFile
|
|
*/
|
|
public function testRemovingFile(
|
|
string $patch_file,
|
|
string $pre,
|
|
string $special,
|
|
string $post,
|
|
): void {
|
|
$patch = file_get_contents($patch_file);
|
|
$lines = explode("\n", trim($patch));
|
|
$git_version = trim($lines[count($lines) - 1]);
|
|
|
|
$changeset = ShipItRepoGIT::getChangesetFromExportedPatch($patch);
|
|
assert($changeset !== null);
|
|
$this->assertSame(
|
|
1,
|
|
$changeset->getDiffs()->count(),
|
|
);
|
|
$hunk = $changeset->getDiffs()->at(0)['body'];
|
|
$this->assertContains(
|
|
$pre,
|
|
$hunk,
|
|
);
|
|
$this->assertContains(
|
|
$special,
|
|
$hunk,
|
|
);
|
|
$this->assertContains(
|
|
$post,
|
|
$hunk,
|
|
);
|
|
$this->assertNotContains(
|
|
$git_version,
|
|
$hunk,
|
|
);
|
|
}
|
|
|
|
public function testNoNewlineAtEOF(): void {
|
|
$patch = file_get_contents(__DIR__.'/git-diffs/no-newline-at-eof.patch');
|
|
$lines = explode("\n", trim($patch));
|
|
$git_version = trim($lines[count($lines) - 1]);
|
|
|
|
$changeset = ShipItRepoGIT::getChangesetFromExportedPatch($patch);
|
|
assert($changeset !== null);
|
|
|
|
$hunk = $changeset->getDiffs()->at(0)['body'];
|
|
$this->assertContains(
|
|
'foo',
|
|
$hunk,
|
|
);
|
|
$this->assertContains(
|
|
"\n\\ No newline at",
|
|
$hunk,
|
|
);
|
|
$this->assertNotContains(
|
|
$git_version,
|
|
$hunk,
|
|
);
|
|
}
|
|
|
|
public function testAddingNewlineAtEOF() {
|
|
$patch = file_get_contents(__DIR__.'/git-diffs/add-newline-at-eof.patch');
|
|
$changeset = ShipItRepoGIT::getChangesetFromExportedPatch($patch);
|
|
assert($changeset !== null);
|
|
|
|
$hunk = $changeset->getDiffs()->at(0)['body'];
|
|
$this->assertContains(' foo', $hunk);
|
|
$this->assertContains('-bar', $hunk);
|
|
$this->assertContains('+bar', $hunk);
|
|
$this->assertContains('\ No newline at end of file', $hunk);
|
|
}
|
|
|
|
public function testStripFileListFromShortCommit() {
|
|
$patch = file_get_contents(__DIR__.'/git-diffs/no-summary-in-message.patch');
|
|
$changeset = ShipItRepoGIT::getChangesetFromExportedPatch($patch);
|
|
assert($changeset !== null);
|
|
|
|
$message = $changeset->getMessage();
|
|
$this->assertEquals("", $message);
|
|
}
|
|
|
|
public function testStripFileListFromLongCommit() {
|
|
$patch = file_get_contents(__DIR__.'/git-diffs/has-summary-in-message.patch');
|
|
$changeset = ShipItRepoGIT::getChangesetFromExportedPatch($patch);
|
|
assert($changeset !== null);
|
|
|
|
$message = $changeset->getMessage();
|
|
$this->assertContains('This is a long commit message.', $changeset->getSubject());
|
|
$this->assertEquals(
|
|
"This is a really long commit message.\n\n".
|
|
"And it also has a \"---\" block in it.\n\n".
|
|
"---\n\n".
|
|
"More stuff!!",
|
|
$message
|
|
);
|
|
}
|
|
}
|