From 3453fd73f977023a1a7e1ea6a185057c2a2663dc Mon Sep 17 00:00:00 2001
From: Jason Ge <jungejason@fb.com>
Date: Fri, 8 Jul 2011 20:46:00 -0700
Subject: [PATCH] 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
---
 src/parser/bundle/ArcanistBundle.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/parser/bundle/ArcanistBundle.php b/src/parser/bundle/ArcanistBundle.php
index 4f2dfad7..a591ca54 100644
--- a/src/parser/bundle/ArcanistBundle.php
+++ b/src/parser/bundle/ArcanistBundle.php
@@ -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) {