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

Unified Diff: gcl.py

Issue 9214004: Add UpgradeToHttps() to reliably and forcibly upgrade all urls to https (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Saner processing. Had to workaround urlparse default behavior 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 | « no previous file | gclient_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gcl.py
diff --git a/gcl.py b/gcl.py
index 3a17fc820164dfde7e3f0c6f1eab27d53192b815..8a0dfc64e966b4a5724fdfcf22d952e0964898f2 100755
--- a/gcl.py
+++ b/gcl.py
@@ -294,10 +294,8 @@ class ChangeInfo(object):
self.patch = None
self._local_root = local_root
self.needs_upload = needs_upload
- self.rietveld = rietveld_url
- if not self.rietveld:
- # Set the default value.
- self.rietveld = GetCodeReviewSetting('CODE_REVIEW_SERVER')
+ self.rietveld = gclient_utils.UpgradeToHttps(
+ rietveld_url or GetCodeReviewSetting('CODE_REVIEW_SERVER'))
self._rpc_server = None
def _get_description(self):
@@ -1039,7 +1037,7 @@ def CMDcommit(change_info, args):
if change_info.issue:
revision = re.compile(".*?\nCommitted revision (\d+)",
re.DOTALL).match(output).group(1)
- viewvc_url = GetCodeReviewSetting("VIEW_VC")
+ viewvc_url = gclient_utils.UpgradeToHttps(GetCodeReviewSetting('VIEW_VC'))
change_info.description += '\n'
if viewvc_url:
change_info.description += "\nCommitted: " + viewvc_url + revision
« no previous file with comments | « no previous file | gclient_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698