mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-23 22:10:55 +01:00
Fix SVN commit change parser for files moved from deleted directory
Summary: This continues work started at D2215. Files moved from deleted directory were marked as Copied Here instead of Moved Here. Test Plan: Reparsed two commits which was previously wrong, now correct. Reviewers: epriestley Reviewed By: epriestley CC: aran Maniphest Tasks: T1114 Differential Revision: https://secure.phabricator.com/D2229
This commit is contained in:
parent
ef990703fa
commit
d17be1d824
1 changed files with 42 additions and 40 deletions
|
@ -140,9 +140,49 @@ class PhabricatorRepositorySvnCommitChangeParserWorker
|
|||
}
|
||||
}
|
||||
|
||||
$path_file_types = $this->lookupPathFileTypes($repository, $lookup);
|
||||
|
||||
$effects = array();
|
||||
|
||||
$path_file_types = $this->lookupPathFileTypes($repository, $lookup);
|
||||
foreach ($raw_paths as $path => $raw_info) {
|
||||
if ($raw_info['rawChangeType'] == 'D' &&
|
||||
$path_file_types[$path] == DifferentialChangeType::FILE_DIRECTORY) {
|
||||
|
||||
// Bad. Child paths aren't enumerated in "svn log" so we need
|
||||
// to go fishing.
|
||||
$list = $this->lookupRecursiveFileList(
|
||||
$repository,
|
||||
$lookup[$path]);
|
||||
|
||||
foreach ($list as $deleted_path => $path_file_type) {
|
||||
$deleted_path = rtrim($path.'/'.$deleted_path, '/');
|
||||
if (!empty($raw_paths[$deleted_path])) {
|
||||
// We somehow learned about this deletion explicitly?
|
||||
// TODO: Unclear how this is possible.
|
||||
continue;
|
||||
}
|
||||
$effect_type = DifferentialChangeType::TYPE_DELETE;
|
||||
$effect_target_path = null;
|
||||
if (isset($copied_or_moved_map[$deleted_path])) {
|
||||
$effect_target_path = $path;
|
||||
if (count($copied_or_moved_map[$deleted_path]) > 1) {
|
||||
$effect_type = DifferentialChangeType::TYPE_MULTICOPY;
|
||||
} else {
|
||||
$effect_type = DifferentialChangeType::TYPE_MOVE_AWAY;
|
||||
}
|
||||
}
|
||||
$effects[$deleted_path] = array(
|
||||
'rawPath' => $deleted_path,
|
||||
'rawTargetPath' => $effect_target_path,
|
||||
'rawTargetCommit' => null,
|
||||
'rawDirect' => true,
|
||||
'changeType' => $effect_type,
|
||||
'fileType' => $path_file_type,
|
||||
);
|
||||
$deleted_paths[$deleted_path] = $effects[$deleted_path];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$resolved_types = array();
|
||||
$supplemental = array();
|
||||
foreach ($raw_paths as $path => $raw_info) {
|
||||
|
@ -160,44 +200,6 @@ class PhabricatorRepositorySvnCommitChangeParserWorker
|
|||
} else {
|
||||
$type = DifferentialChangeType::TYPE_DELETE;
|
||||
}
|
||||
$file_type = $path_file_types[$path];
|
||||
|
||||
if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
|
||||
// Bad. Child paths aren't enumerated in "svn log" so we need
|
||||
// to go fishing.
|
||||
|
||||
$list = $this->lookupRecursiveFileList(
|
||||
$repository,
|
||||
$lookup[$path]);
|
||||
|
||||
foreach ($list as $deleted_path => $path_file_type) {
|
||||
$deleted_path = rtrim($path.'/'.$deleted_path, '/');
|
||||
if (!empty($raw_paths[$deleted_path])) {
|
||||
// We somehow learned about this deletion explicitly?
|
||||
// TODO: Unclear how this is possible.
|
||||
continue;
|
||||
}
|
||||
$effect_type = $type;
|
||||
$effect_target_path = null;
|
||||
if (isset($copied_or_moved_map[$deleted_path])) {
|
||||
$effect_target_path = $path;
|
||||
if (count($copied_or_moved_map[$deleted_path]) > 1) {
|
||||
$effect_type = DifferentialChangeType::TYPE_MULTICOPY;
|
||||
} else {
|
||||
$effect_type = DifferentialChangeType::TYPE_MOVE_AWAY;
|
||||
}
|
||||
}
|
||||
$effects[$deleted_path] = array(
|
||||
'rawPath' => $deleted_path,
|
||||
'rawTargetPath' => $effect_target_path,
|
||||
'rawTargetCommit' => null,
|
||||
'rawDirect' => true,
|
||||
|
||||
'changeType' => $effect_type,
|
||||
'fileType' => $path_file_type,
|
||||
);
|
||||
}
|
||||
}
|
||||
break;
|
||||
case 'A':
|
||||
$copy_from = $raw_info['rawTargetPath'];
|
||||
|
|
Loading…
Reference in a new issue