From 087066c5533b3e4e90d1133c77228e1047f03b3a Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 8 Sep 2011 20:35:13 +0000
Subject: [PATCH] Make the rietveld client code ignore file status more often.

It's proved to be unreliable.

R=dpranke@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/7857006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100236 0039d316-1c4b-4281-b951-d872f2087c98
---
 rietveld.py            | 72 ++++++++++++++++++++----------------------
 tests/rietveld_test.py |  6 ++--
 2 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/rietveld.py b/rietveld.py
index 9a70ee75e..0b88eb0eb 100644
--- a/rietveld.py
+++ b/rietveld.py
@@ -121,53 +121,49 @@ class Rietveld(object):
     for filename, state in props.get('files', {}).iteritems():
       logging.debug('%s' % filename)
       status = state.get('status')
-      if status is None:
+      if not status:
         raise patch.UnsupportedPatchFormat(
             filename, 'File\'s status is None, patchset upload is incomplete.')
+      if status[0] not in ('A', 'D', 'M'):
+        raise patch.UnsupportedPatchFormat(
+            filename, 'Change with status \'%s\' is not supported.' % status)
 
-      if status[0] == 'D':
-        if status[0] != status.strip():
-          raise patch.UnsupportedPatchFormat(
-              filename, 'Deleted file shouldn\'t have property change.')
-        # Ignore the diff.
-        out.append(patch.FilePatchDelete(filename, state['is_binary']))
-      elif status[0] in ('A', 'M'):
-        svn_props = self.parse_svn_properties(
-            state.get('property_changes', ''), filename)
-        if state['is_binary']:
+      svn_props = self.parse_svn_properties(
+          state.get('property_changes', ''), filename)
+
+      if state.get('is_binary'):
+        if status[0] == 'D':
+          if status[0] != status.strip():
+            raise patch.UnsupportedPatchFormat(
+                filename, 'Deleted file shouldn\'t have property change.')
+          out.append(patch.FilePatchDelete(filename, state['is_binary']))
+        else:
           out.append(patch.FilePatchBinary(
               filename,
               self.get_file_content(issue, patchset, state['id']),
               svn_props,
               is_new=(status[0] == 'A')))
-        else:
-          # Ignores num_chunks since it may only contain an header.
-          diff = None
-          try:
-            diff = self.get_file_diff(issue, patchset, state['id'])
-          except urllib2.HTTPError, e:
-            if e.code == 404:
-              raise patch.UnsupportedPatchFormat(
-                  filename, 'File doesn\'t have a diff.')
-            raise
-          # It may happen on property-only change or svn copy without diff.
-          if not diff:
-            # Support this use case if it ever happen.
-            raise patch.UnsupportedPatchFormat(
-                filename, 'Empty diff is not supported yet.\n')
-          p = patch.FilePatchDiff(filename, diff, svn_props)
-          out.append(p)
-          if status[0] == 'A':
-            # It won't be set for empty file.
-            p.is_new = True
-          if (len(status) > 1 and
-              status[1] == '+' and
-              not (p.source_filename or p.svn_properties)):
-            raise patch.UnsupportedPatchFormat(
-                filename, 'Failed to process the svn properties')
-      else:
+        continue
+
+      try:
+        diff = self.get_file_diff(issue, patchset, state['id'])
+      except urllib2.HTTPError, e:
+        if e.code == 404:
+          raise patch.UnsupportedPatchFormat(
+              filename, 'File doesn\'t have a diff.')
+        raise
+
+      # FilePatchDiff() will detect file deletion automatically.
+      p = patch.FilePatchDiff(filename, diff, svn_props)
+      out.append(p)
+      if status[0] == 'A':
+        # It won't be set for empty file.
+        p.is_new = True
+      if (len(status) > 1 and
+          status[1] == '+' and
+          not (p.source_filename or p.svn_properties)):
         raise patch.UnsupportedPatchFormat(
-            filename, 'Change with status \'%s\' is not supported.' % status)
+            filename, 'Failed to process the svn properties')
 
     return patch.PatchSet(out)
 
diff --git a/tests/rietveld_test.py b/tests/rietveld_test.py
index 8a3e81e07..ff43e459d 100755
--- a/tests/rietveld_test.py
+++ b/tests/rietveld_test.py
@@ -180,12 +180,14 @@ class RietveldTest(unittest.TestCase):
         is_new=True)
 
   def test_delete(self):
+    name = 'tools/clang_check/README.chromium'
     self.requests = [
-        ('/api/123/456', _api({'file_a': _file('D')})),
+        ('/api/123/456', _api({name: _file('D')})),
+        ('/download/issue123_456_789.diff', RAW.DELETE),
     ]
     patches = self.rietveld.get_patch(123, 456)
     self.assertEquals(1, len(patches.patches))
-    self._check_patch(patches.patches[0], 'file_a', None, is_delete=True)
+    self._check_patch(patches.patches[0], name, None, is_delete=True)
 
   def test_m_plus(self):
     properties = '\nAdded: svn:eol-style\n   + LF\n'