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

Unified Diff: rietveld.py

Issue 9172003: Accept svn:mime-type as a valid svn property. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 8 years, 11 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 | « checkout.py ('k') | tests/rietveld_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: rietveld.py
diff --git a/rietveld.py b/rietveld.py
index 037640c6abf8e0100f3630f7ef3436b198c0363a..5d6804174f8b1c7c8b2911b98baae287fc0c4746 100644
--- a/rietveld.py
+++ b/rietveld.py
@@ -198,7 +198,8 @@ class Rietveld(object):
match = re.match(r'^(\w+): (.+)$', action)
if not match or not rietveld_svn_props:
raise patch.UnsupportedPatchFormat(
- filename, 'Failed to parse svn properties.')
+ filename,
+ 'Failed to parse svn properties: %s, %s' % (action, svn_props))
if match.group(2) == 'svn:mergeinfo':
# Silently ignore the content.
@@ -210,7 +211,7 @@ class Rietveld(object):
raise patch.UnsupportedPatchFormat(
filename, 'Unsupported svn property operation.')
- if match.group(2) in ('svn:eol-style', 'svn:executable'):
+ if match.group(2) in ('svn:eol-style', 'svn:executable', 'svn:mime-type'):
# ' + foo' where foo is the new value. That's fragile.
content = rietveld_svn_props.pop(0)
match2 = re.match(r'^ \+ (.*)$', content)
« no previous file with comments | « checkout.py ('k') | tests/rietveld_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698