mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-21 22:32:41 +01:00
Use phid instead of guid for image diff
Summary: in https://secure.phabricator.com/rARC36de84ee, we changed to use 'binary-phid' from 'binary-guid'. Several places are still using 'binary-guid'. Fix them. Test Plan: run 'arc patch' against a revision which was throwing exception because of this issue and it worked. Reviewed By: epriestley Reviewers: epriestley, sgrimm CC: aran, epriestley Differential Revision: 624
This commit is contained in:
parent
88c4e69802
commit
3453fd73f9
1 changed files with 6 additions and 6 deletions
|
@ -97,11 +97,11 @@ class ArcanistBundle {
|
|||
|
||||
$blobs = array();
|
||||
foreach ($change_list as $change) {
|
||||
if (!empty($change['metadata']['old:binary-guid'])) {
|
||||
$blobs[$change['metadata']['old:binary-guid']] = null;
|
||||
if (!empty($change['metadata']['old:binary-phid'])) {
|
||||
$blobs[$change['metadata']['old:binary-phid']] = null;
|
||||
}
|
||||
if (!empty($change['metadata']['new:binary-guid'])) {
|
||||
$blobs[$change['metadata']['new:binary-guid']] = null;
|
||||
if (!empty($change['metadata']['new:binary-phid'])) {
|
||||
$blobs[$change['metadata']['new:binary-phid']] = null;
|
||||
}
|
||||
}
|
||||
foreach ($blobs as $phid => $null) {
|
||||
|
@ -388,8 +388,8 @@ class ArcanistBundle {
|
|||
}
|
||||
|
||||
private function buildBinaryChange(ArcanistDiffChange $change) {
|
||||
$old_phid = $change->getMetadata('old:binary-guid', null);
|
||||
$new_phid = $change->getMetadata('new:binary-guid', null);
|
||||
$old_phid = $change->getMetadata('old:binary-phid', null);
|
||||
$new_phid = $change->getMetadata('new:binary-phid', null);
|
||||
|
||||
$type = $change->getType();
|
||||
if ($type == ArcanistDiffChangeType::TYPE_ADD) {
|
||||
|
|
Loading…
Reference in a new issue