Page MenuHomePhabricator
Files F14020487

D8012.id.diff
No OneTemporary
Actions

D8012.id.diff
View Options

Index: src/__phutil_library_map__.php
===================================================================
--- src/__phutil_library_map__.php
+++ src/__phutil_library_map__.php
@@ -1255,6 +1255,7 @@
'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
'PhabricatorCalendarViewStatusController' => 'applications/calendar/controller/PhabricatorCalendarViewStatusController.php',
'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php',
+ 'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php',
'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php',
'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
@@ -3846,6 +3847,7 @@
'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
'PhabricatorCalendarViewStatusController' => 'PhabricatorCalendarController',
'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter',
+ 'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
'PhabricatorChatLogChannel' =>
array(
Index: src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php
===================================================================
--- src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php
+++ src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php
@@ -76,9 +76,18 @@
->setRepository($repository)
->pullRepository();
- $this->pulled[$callsign] = true;
+ return $repository;
+ }
+
+ protected function buildDiscoveredRepository($callsign) {
+ $repository = $this->buildPulledRepository($callsign);
+
+ id(new PhabricatorRepositoryDiscoveryEngine())
+ ->setRepository($repository)
+ ->discoverCommits($repository);
return $repository;
}
+
}
Index: src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php
===================================================================
--- /dev/null
+++ src/applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php
@@ -0,0 +1,275 @@
+<?php
+
+final class PhabricatorChangeParserTestCase
+ extends PhabricatorWorkingCopyTestCase {
+
+ public function testGitParser() {
+ $repository = $this->buildDiscoveredRepository('CHA');
+ $viewer = PhabricatorUser::getOmnipotentUser();
+
+ $commits = id(new DiffusionCommitQuery())
+ ->setViewer($viewer)
+ ->withRepositoryIDs(array($repository->getID()))
+ ->execute();
+
+ $this->expectChanges(
+ $repository,
+ $commits,
+ array(
+ // 8ebb73c add +x
+ '8ebb73c3f127625ad090472f4f3bfc72804def54' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 0,
+ 1389892449,
+ ),
+ array(
+ '/file_moved',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHANGE,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892449,
+ ),
+ ),
+
+ // ee9c790 add symlink
+ 'ee9c7909e012da7d75e8e1293c7803a6e73ac26a' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 0,
+ 1389892436,
+ ),
+ array(
+ '/file_link',
+ null,
+ null,
+ DifferentialChangeType::TYPE_ADD,
+ DifferentialChangeType::FILE_SYMLINK,
+ 1,
+ 1389892436,
+ ),
+ ),
+
+ // 7260ca4 add directory file
+ '7260ca4b6cec35e755bb5365c4ccdd3f1977772e' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 0,
+ 1389892408,
+ ),
+ array(
+ '/dir',
+ null,
+ null,
+ DifferentialChangeType::TYPE_ADD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 1,
+ 1389892408,
+ ),
+ array(
+ '/dir/subfile',
+ null,
+ null,
+ DifferentialChangeType::TYPE_ADD,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892408,
+ ),
+ ),
+
+ // 1fe783c move a file
+ '1fe783cf207c1e5f3e01650d2d9cb80b8a707f0e' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 0,
+ 1389892388,
+ ),
+ array(
+ '/file',
+ null,
+ null,
+ DifferentialChangeType::TYPE_MOVE_AWAY,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892388,
+ ),
+ array(
+ '/file_moved',
+ '/file',
+ '1fe783cf207c1e5f3e01650d2d9cb80b8a707f0e',
+ DifferentialChangeType::TYPE_MOVE_HERE,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892388,
+ ),
+ ),
+
+ // 376af8c copy a file
+ '376af8cd8f5b96ec55b7d9a86ccc85b8df8fb833' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 0,
+ 1389892377,
+ ),
+ array(
+ '/file',
+ null,
+ null,
+ DifferentialChangeType::TYPE_COPY_AWAY,
+ DifferentialChangeType::FILE_NORMAL,
+ 0,
+ 1389892377,
+ ),
+ array(
+ '/file_copy',
+ '/file',
+ '376af8cd8f5b96ec55b7d9a86ccc85b8df8fb833',
+ DifferentialChangeType::TYPE_COPY_HERE,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892377,
+ ),
+ ),
+
+ // ece6ea6 changed a file
+ 'ece6ea6c6836e8b11a103e21707b8f30e6840c94' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ 0,
+ 1389892352,
+ ),
+ array(
+ '/file',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHANGE,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892352,
+ ),
+ ),
+
+ // 513103f added a file
+ '513103f65b8413dd2f1a1b5c1d4852a4a598540f' => array(
+ array(
+ '/',
+ null,
+ null,
+ DifferentialChangeType::TYPE_CHILD,
+ DifferentialChangeType::FILE_DIRECTORY,
+ // This is the initial commit and technically created this
+ // directory; arguably the parser should figure this out and
+ // mark this as a direct change.
+ 0,
+ 1389892330,
+ ),
+ array(
+ '/file',
+ null,
+ null,
+ DifferentialChangeType::TYPE_ADD,
+ DifferentialChangeType::FILE_NORMAL,
+ 1,
+ 1389892330,
+ ),
+ ),
+ ));
+ }
+
+ private function expectChanges(
+ PhabricatorRepository $repository,
+ array $commits,
+ array $expect) {
+
+ switch ($repository->getVersionControlSystem()) {
+ case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
+ $parser = 'PhabricatorRepositoryGitCommitChangeParserWorker';
+ break;
+ default:
+ throw new Exception(pht('No support yet.'));
+ }
+
+ foreach ($commits as $commit) {
+ $commit_identifier = $commit->getCommitIdentifier();
+ $expect_changes = idx($expect, $commit_identifier);
+
+ if ($expect_changes === null) {
+ $this->assertEqual(
+ $commit_identifier,
+ null,
+ pht(
+ 'No test entry for commit "%s" in repository "%s"!',
+ $commit_identifier,
+ $repository->getCallsign()));
+ }
+
+ $parser_object = newv($parser, array(array()));
+ $changes = $parser_object->parseChangesForUnitTest($repository, $commit);
+
+ $path_map = id(new DiffusionPathQuery())
+ ->withPathIDs(mpull($changes, 'getPathID'))
+ ->execute();
+ $path_map = ipull($path_map, 'path');
+
+ $target_commits = array_filter(mpull($changes, 'getTargetCommitID'));
+ if ($target_commits) {
+ $commits = id(new DiffusionCommitQuery())
+ ->setViewer(PhabricatorUser::getOmnipotentUser())
+ ->withIDs($target_commits)
+ ->execute();
+ $target_commits = mpull($commits, 'getCommitIdentifier', 'getID');
+ }
+
+ $dicts = array();
+ foreach ($changes as $key => $change) {
+ $target_path = idx($path_map, $change->getTargetPathID());
+ $target_commit = idx($target_commits, $change->getTargetCommitID());
+
+ $dicts[$key] = array(
+ $path_map[(int)$change->getPathID()],
+ $target_path,
+ $target_commit,
+ (int)$change->getChangeType(),
+ (int)$change->getFileType(),
+ (int)$change->getIsDirect(),
+ (int)$change->getCommitSequence(),
+ );
+ }
+
+ $dicts = ipull($dicts, null, 0);
+ $expect_changes = ipull($expect_changes, null, 0);
+ ksort($dicts);
+ ksort($expect_changes);
+
+ $this->assertEqual($expect_changes, $dicts);
+ }
+ }
+
+
+}
Index: src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
===================================================================
--- src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
+++ src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
@@ -35,6 +35,12 @@
$this->finishParse();
}
+ public function parseChangesForUnitTest(
+ PhabricatorRepository $repository,
+ PhabricatorRepositoryCommit $commit) {
+ return $this->parseCommitChanges($repository, $commit);
+ }
+
public static function lookupOrCreatePaths(array $paths) {
$repository = new PhabricatorRepository();
$conn_w = $repository->establishConnection('w');
Index: src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php
===================================================================
--- src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php
+++ src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php
@@ -228,25 +228,16 @@
}
}
-
$results = array();
foreach ($changes as $change) {
- $target_path_id = $change['targetPathID']
- ? (int)$change['targetPathID']
- : null;
-
- $target_commit_id = $change['targetCommitID']
- ? (int)$change['targetCommitID']
- : null;
-
$result = id(new PhabricatorRepositoryParsedChange())
- ->setPathID((int)$change['pathID'])
- ->setTargetPathID($target_path_id)
- ->setTargetCommitID($target_commit_id)
- ->setChangeType((int)$change['changeType'])
+ ->setPathID($change['pathID'])
+ ->setTargetPathID($change['targetPathID'])
+ ->setTargetCommitID($change['targetCommitID'])
+ ->setChangeType($change['changeType'])
->setFileType($change['fileType'])
- ->setIsDirect((int)$change['isDirect'])
- ->setCommitSequence((int)$change['commitSequence']);
+ ->setIsDirect($change['isDirect'])
+ ->setCommitSequence($change['commitSequence']);
$results[] = $result;
}

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 12:37 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6713211
Default Alt Text
D8012.id.diff (12 KB)

Event Timeline

Phabricator · Built by Phacility