Fix support when 2 properties are modified.

rietveld.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 """Defines class Rietveld to easily access a rietveld instance.
 
 Security implications:
 
 The following hypothesis are made:
 - Rietveld enforces:
   - Nobody else than issue owner can upload a patch set
@@ skipping 169 matching lines @@
     rietveld_svn_props = rietveld_svn_props.splitlines()
     svn_props = []
     if not rietveld_svn_props:
       return svn_props
     # 1. Ignore svn:mergeinfo.
     # 2. Accept svn:eol-style and svn:executable.
     # 3. Refuse any other.
     # \n
     # Added: svn:ignore\n
     #    + LF\n
+
+    spacer = rietveld_svn_props.pop(0)
+    if spacer or not rietveld_svn_props:
+      # svn diff always put a spacer between the unified diff and property
+      # diff
+      raise patch.UnsupportedPatchFormat(
+          filename, 'Failed to parse svn properties.')
+
     while rietveld_svn_props:
-      spacer = rietveld_svn_props.pop(0)
-      if spacer or not rietveld_svn_props:
-        # svn diff always put a spacer between the unified diff and property
-        # diff
-        raise patch.UnsupportedPatchFormat(
-            filename, 'Failed to parse svn properties.')
-

[Dirk Pranke, 2011/09/08 18:35:36]

Can you explain what the bug was here and why this fixes it? I'm not following
the fix.

[M-A Ruel, 2011/09/08 18:37:58]

The new unit test checks exactly that; when there's multiple svn metadata, they
are not separated by multiple lines as I thought they were.

       # Something like 'Added: svn:eol-style'. Note the action is localized.
       # *sigh*.
       action = rietveld_svn_props.pop(0)
       match = re.match(r'^(\w+): (.+)$', action)
       if not match or not rietveld_svn_props:
         raise patch.UnsupportedPatchFormat(
             filename, 'Failed to parse svn properties.')
 
       if match.group(2) == 'svn:mergeinfo':
         # Silently ignore the content.
@@ skipping 64 matching lines @@
         if retry >= (maxtries - 1):
           raise
         if not 'Name or service not known' in e.reason:
           # Usually internal GAE flakiness.
           raise
       # If reaching this line, loop again. Uses a small backoff.
       time.sleep(1+maxtries*2)
 
   # DEPRECATED.
   Send = get