Simplify cq url match rules and add http urls

projects.py

Index: projects.py
diff --git a/projects.py b/projects.py
index 737ba928eab50c56bc5da569a553780a712dc6fd..e06a4556915bb31e1ae8f91b914688e5a9377786 100644
--- a/projects.py
+++ b/projects.py
@@ -164,13 +164,9 @@ def _gen_blink(user, root_dir, rietveld_obj, no_try):
 
   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(
@@ -252,20 +248,14 @@ def _gen_chromium(user, root_dir, rietveld_obj, no_try):
 
   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(
@@ -567,11 +557,12 @@ def _gen_nacl(user, root_dir, rietveld_obj, no_try):
       '^%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(
@@ -678,20 +669,16 @@ def _gen_tools(user, root_dir, rietveld_obj, _no_try):
       '^%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)