Simplify cq url match rules and add http urls

projects.py

 # Copyright (c) 2012 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.
 """Define the supported projects."""
 
 import json
 import logging
 import os
 import re
 import sys
@@ skipping 146 matching lines @@
       [])
   context_obj = context.Context(
       rietveld_obj,
       local_checkout,
       async_push.AsyncPush(
         'https://chromium-status.appspot.com/cq',
         _chromium_status_pwd(root_dir)))
 
   project_bases = [
       '^%s/trunk(|/.*)$' % re.escape(base) for base in BLINK_SVN_BASES]
-
-  aliases = (
-    'https://chromium.googlesource.com/chromium/blink',
-    'https://chromium.googlesource.com/chromium/blink.git',
-  )
-  project_bases.extend(
-      r'^%s%s$' % (re.escape(i), BRANCH_MATCH) for i in aliases)
+  project_bases.append(
+      r'^https?\:\/\/chromium.googlesource.com\/chromium\/blink(?:\.git)?%s$' %
+        BRANCH_MATCH)
   verifiers_no_patch = [
       project_base.ProjectBaseUrlVerifier(project_bases),
       reviewer_lgtm.ReviewerLgtmVerifier(
           _get_chromium_committers(),
           [re.escape(user)]),
   ]
   verifiers = []
   prereq_builder = 'blink_presubmit'
   prereq_tests = ['presubmit']
   step_verifiers = [
@@ skipping 61 matching lines @@
       local_checkout,
       async_push.AsyncPush(
         'https://chromium-status.appspot.com/cq',
         _chromium_status_pwd(root_dir)))
 
   project_bases = [
       '^%s/trunk/src(|/.*)$' % re.escape(base) for base in CHROME_SVN_BASES]
 
   aliases = (
     # Old path.
-    'http://git.chromium.org/git/chromium.git',
-    'https://git.chromium.org/git/chromium.git',
+    'git.chromium.org/git/chromium',
     # New path.
-    'http://git.chromium.org/chromium/src.git',
-    'https://git.chromium.org/chromium/src.git',
-    'http://git.chromium.org/git/chromium/src',
-    'https://git.chromium.org/git/chromium/src',
-    'http://git.chromium.org/git/chromium/src.git',
-    'https://git.chromium.org/git/chromium/src.git',
-    'https://chromium.googlesource.com/chromium/src',
-    'https://chromium.googlesource.com/chromium/src.git',
+    'git.chromium.org/chromium/src',
+    'chromium.googlesource.com/chromium/src',
   )
   project_bases.extend(
-      r'^%s%s$' % (re.escape(i), BRANCH_MATCH) for i in aliases)
+      r'^https?\:\/\/%s(?:\.git)?%s$' % (re.escape(i), BRANCH_MATCH)
+      for i in aliases)
   verifiers_no_patch = [
       project_base.ProjectBaseUrlVerifier(project_bases),
       reviewer_lgtm.ReviewerLgtmVerifier(
           _get_chromium_committers(),
           [re.escape(user)]),
   ]
   verifiers = []
   prereq_builder = 'chromium_presubmit'
   prereq_tests = ['presubmit']
   step_verifiers = [
@@ skipping 281 matching lines @@
         'https://nativeclient-status.appspot.com/cq',
         _chromium_status_pwd(root_dir)))
 
   host_aliases = SVN_HOST_ALIASES + [
       'http://src.chromium.org', 'https://src.chromium.org']
   svn_bases = [i + '/native_client' for i in host_aliases]
   project_bases = [
       '^%s/%s(|/.*)$' % (re.escape(base), offset) for base in svn_bases
   ]
   aliases = (
-    'http://git.chromium.org/native_client/src/native_client.git',
-    'https://chromium.googlesource.com/native_client/src/native_client.git',
+    'git.chromium.org/native_client/src/native_client',
+    'chromium.googlesource.com/native_client/src/native_client',
   )
   project_bases.extend(
-      r'^%s%s$' % (re.escape(i), BRANCH_MATCH) for i in aliases)
+      r'^https?\:\/\/%s(?:\.git)?%s$' % (re.escape(i), BRANCH_MATCH)
+      for i in aliases)
   verifiers_no_patch = [
       project_base.ProjectBaseUrlVerifier(project_bases),
       reviewer_lgtm.ReviewerLgtmVerifier(
           _get_nacl_committers(),
           [re.escape(user)]),
   ]
   verifiers = [
       presubmit_check.PresubmitCheckVerifier(context_obj),
   ]
   if not no_try:
@@ skipping 86 matching lines @@
   chrome/trunk/tools.
 
   These don't have a try server but have presubmit checks.
   """
   # Ignore no_try.
   path = 'tools'
   project_bases = [
       '^%s/trunk/%s(|/.*)$' % (re.escape(base), path)
       for base in CHROME_SVN_BASES
   ]
-  regexp = r'([a-z0-9\-_]+)'
-  githost = '://git.chromium.org/'
-  googlesource = '://chromium.googlesource.com/'
   aliases = (
-    re.escape( 'http' + githost + 'chromium/tools/') + regexp + r'\.git',
-    re.escape('https' + githost + 'chromium/tools/') + regexp + r'\.git',
-    re.escape( 'http' + githost + 'git/chromium/tools/') + regexp,
-    re.escape('https' + githost + 'git/chromium/tools/') + regexp,
-    re.escape( 'http' + githost + 'git/chromium/tools/') + regexp + r'\.git',
-    re.escape('https' + githost + 'git/chromium/tools/') + regexp + r'\.git',
-    re.escape('https' + googlesource + 'chromium/tools/') + regexp,
-    re.escape('https' + googlesource + 'chromium/tools/') + regexp + r'\.git',
+    # Old path.
+    'git.chromium.org/git/chromium/tools',
+    # New path.
+    'git.chromium.org/chromium/tools',
+    'chromium.googlesource.com/chromium/tools',
   )
-  project_bases.extend('^%s%s$' % (i, BRANCH_MATCH) for i in aliases)
+  project_bases.extend(
+      r'^https?\:\/\/%s\/([a-z0-9\-_]+)(?:\.git)?%s$' % (
+        re.escape(i), BRANCH_MATCH) for i in aliases)
   return _internal_simple(path, project_bases, user, root_dir, rietveld_obj)
 
 
 def _gen_chromium_deps(user, root_dir, rietveld_obj, _no_try):
   """Generates a PendingManager commit queue for
   chrome/trunk/deps/.
   """
   # Ignore no_try.
   path = 'deps'
   project_bases = [
@@ skipping 39 matching lines @@
   """List the projects that can be managed by the commit queue."""
   return sorted(
       x[5:] for x in dir(sys.modules[__name__]) if x.startswith('_gen_'))
 
 
 def load_project(project, user, root_dir, rietveld_obj, no_try):
   """Loads the specified project."""
   assert os.path.isabs(root_dir)
   return getattr(sys.modules[__name__], '_gen_' + project)(
       user, root_dir, rietveld_obj, no_try)