1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-25 16:22:42 +01:00

Keep Arcanist from mistaking paths that look like svn:externals as svn:externals

Summary: Fixes T3920. Added a slash to the path and external name so that "public" and "publicnotexternal" won't appear to be the same root.

Test Plan:
We've had this issue in one of our projects for some time, just ran into it again today. Ran the patched arc against the same directory structure and the troublesome file was added to the diff. Confirmed that files
modified in the "public" (svn external) folder are still caught as external modifications.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T3920

Differential Revision: https://secure.phabricator.com/D7226
This commit is contained in:
root 2013-10-04 17:31:18 -07:00 committed by epriestley
parent 4e892e7269
commit 10a9bb1e99

View file

@ -128,7 +128,7 @@ final class ArcanistSubversionAPI extends ArcanistRepositoryAPI {
foreach ($files as $path => $mask) { foreach ($files as $path => $mask) {
foreach ($externals as $external) { foreach ($externals as $external) {
if (!strncmp($path, $external, strlen($external))) { if (!strncmp($path . '/', $external . '/', strlen($external) + 1)) {
$files[$path] |= self::FLAG_EXTERNALS; $files[$path] |= self::FLAG_EXTERNALS;
} }
} }