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: drover.py

Issue 6893095: Don't eat newlines in CL descriptions when merging changes using drover. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools/
Patch Set: '' Created 9 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: drover.py
===================================================================
--- drover.py (revision 83340)
+++ drover.py (working copy)
@@ -118,10 +118,10 @@
def getRevisionLog(url, revision):
"""Takes an svn url and gets the associated revision."""
svn_log = subprocess2.check_output(
- ['svn', 'log', url, '-r', str(revision)]).splitlines()
- # Don't include the header lines and the trailing "---..." line and eliminate
- # any '\r's.
- return ''.join([l.replace('\r','') for l in svn_log[3:-1]])
+ ['svn', 'log', url, '-r', str(revision)],
+ universal_newlines=True).splitlines(True)
+ # Don't include the header lines and the trailing "---..." line.
+ return ''.join(svn_log[3:-1])
def getSVNVersionInfo():
"""Extract version information from SVN"""
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698