Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Unified Diff: rietveld.py

Issue 7754020: Fix support when 2 properties are modified. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/rietveld_test.py » ('j') | tests/rietveld_test.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: rietveld.py
diff --git a/rietveld.py b/rietveld.py
index e64a46d1c9decd04ecf2266cb1501667945530c4..9a70ee75eae074b09449f2d78092179764edeabf 100644
--- a/rietveld.py
+++ b/rietveld.py
@@ -187,14 +187,15 @@ class Rietveld(object):
# \n
# Added: svn:ignore\n
# + LF\n
- 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
M-A Ruel 2011/09/08 18:37:58 The new unit test checks exactly that; when there'
+ 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:
# Something like 'Added: svn:eol-style'. Note the action is localized.
# *sigh*.
action = rietveld_svn_props.pop(0)
« no previous file with comments | « no previous file | tests/rietveld_test.py » ('j') | tests/rietveld_test.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698