From 1e612eebc39c5eda972822b52cae3e663b146623 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 18 Feb 2013 08:24:47 -0800 Subject: [PATCH] Fix another SVN issue with "@" files Summary: This chunk of code is kind of iffy and not really correct, but make it not fail, at least. Test Plan: - Added a file named `swamp@2x.jpg` to a working copy. - Used `svn propedit svn:mime-type swamp@2x.jpg@` to incorrectly set its mime type to `text/plain`. - Ran `arc diff`. - Saw `arc diff` "correctly" change its mime-type to a binary mime type. This isn't really correct, but doing it successfully is better than throwing an exception. Reviewers: mbishopim3, chad Reviewed By: mbishopim3 CC: aran Differential Revision: https://secure.phabricator.com/D4998 --- src/repository/api/ArcanistSubversionAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/repository/api/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php index b596c51c..d729fc1e 100644 --- a/src/repository/api/ArcanistSubversionAPI.php +++ b/src/repository/api/ArcanistSubversionAPI.php @@ -385,7 +385,7 @@ final class ArcanistSubversionAPI extends ArcanistRepositoryAPI { if ($mime != 'application/octet-stream') { execx( 'svn propset svn:mime-type application/octet-stream %s', - $this->getPath($path)); + self::escapeFileNameForSVN($this->getPath($path))); } }