revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-29 02:02:40 +01:00
Code Issues Releases Wiki Activity

Make image diffs work again

Browse source 
Summary:
I looked at this quickly to see what was involved and there were only a couple
of issues so here's a patch:

  - On OSX, the "-i" flag does not mean "--mime". Use "--mime" explicitly
instead. This is a minor fix which affects only OS X.
  - I wasn't able to repro the "crazy executables" behavior and think it might
have been me messing something up, so nuke it until we see an issue.
  - Some guid vs phid shenanigans. Differential reads "phid" but arcanist set
"guid". We should move toward "phid"; I started using "guid" before I realized
it was an overloaded term that also refers to a specific GUID implementation
(Microsoft's UUID).

Test Plan:
Uploaded an image diff, saw images in Differential.

Reviewed By: aran
Reviewers: jianfeng, jungejason, aran, tuomaspelkonen
CC: aran
Differential Revision: 466
This commit is contained in:
epriestley 2011-06-14 21:25:31 -07:00
parent 660dd74413
commit 36de84eeee
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/workflow/diff/ArcanistDiffWorkflow.php
View file

@ -755,10 +755,10 @@ EOTEXT
$new_dict = $this->uploadFile($new_file, basename($path), 'new binary'); $new_dict = $this->uploadFile($new_file, basename($path), 'new binary');
if ($old_dict['guid']) { if ($old_dict['guid']) {
$change->setMetadata('old:binary-guid', $old_dict['guid']); $change->setMetadata('old:binary-phid', $old_dict['guid']);
} }
if ($new_dict['guid']) { if ($new_dict['guid']) {
$change->setMetadata('new:binary-guid', $new_dict['guid']); $change->setMetadata('new:binary-phid', $new_dict['guid']);
} }
$change->setMetadata('old:file:size', strlen($old_file)); $change->setMetadata('old:file:size', strlen($old_file));
@ -785,17 +785,11 @@ EOTEXT
return $result; return $result;
} }
$future = new ExecFuture('file -ib -'); $future = new ExecFuture('file -b --mime -');
$future->write($data); $future->write($data);
list($mime_type) = $future->resolvex(); list($mime_type) = $future->resolvex();
$mime_type = trim($mime_type); $mime_type = trim($mime_type);
if (strpos($mime_type, ',') !== false) {
// TODO: This is kind of silly, but 'file -ib' goes crazy on executables.
$mime_type = reset(explode(',', $mime_type));
}
$result['mime'] = $mime_type; $result['mime'] = $mime_type;
// TODO: Make this configurable. // TODO: Make this configurable.