From 363f292fd81fe9b97ff20cb9e7cb2d3cc9fa8267 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 30 Jan 2013 12:35:37 -0800 Subject: [PATCH] Partially revert marking of copies as direct Summary: The other `true` is correct (and I think we can fix the scaling issues) but this one should be an indirect change. This prevents the branch from appearing in the history of every file. (I misread this code and gave @vrana some bad advice originally. This is //actually// consistent with Mercurial and Git.) Test Plan: Partial revert. I'll make this stuff testable. Reviewers: nh, vrana Reviewed By: vrana CC: aran Differential Revision: https://secure.phabricator.com/D4742 --- .../PhabricatorRepositorySvnCommitChangeParserWorker.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php index 082c357508..f6d3a26b94 100644 --- a/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php +++ b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php @@ -266,11 +266,14 @@ final class PhabricatorRepositorySvnCommitChangeParserWorker if (empty($raw_paths[$full_from]) && empty($effects[$full_from])) { if ($other_type == DifferentialChangeType::TYPE_COPY_AWAY) { + // Add an indirect effect for the copied file, if we + // don't already have an entry for it (e.g., a separate + // change). $effects[$full_from] = array( 'rawPath' => $full_from, 'rawTargetPath' => null, 'rawTargetCommit' => null, - 'rawDirect' => true, + 'rawDirect' => false, 'changeType' => $other_type, 'fileType' => $from_file_type,