Simplify cq url match rules and add http urls

tests/project_test.py

 #!/usr/bin/env python
 # 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.
 
 """Integration tests for project.py."""
 
 import logging
 import os
 import random
@@ skipping 187 matching lines @@
               '^svn\\:\\/\\/chrome\\-svn\\/chrome/trunk/tools(|/.*)$',
               '^svn\\:\\/\\/chrome\\-svn\\.corp\\/chrome/trunk/tools(|/.*)$',
               '^svn\\:\\/\\/chrome\\-svn\\.corp\\.google\\.com\\/chrome/trunk/'
                   'tools(|/.*)$',
               '^http\\:\\/\\/src\\.chromium\\.org\\/svn/trunk/tools(|/.*)$',
               '^https\\:\\/\\/src\\.chromium\\.org\\/svn/trunk/tools(|/.*)$',
               '^http\\:\\/\\/src\\.chromium\\.org\\/chrome/trunk/tools(|/.*)$',
               '^https\\:\\/\\/src\\.chromium\\.org\\/chrome/trunk/tools(|/.*)$',
 
               # git
-              '^http\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^https\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^http\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)' + branch,
-              '^https\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)' + branch,
-              '^http\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^https\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
-                  '([a-z0-9\\-_]+)\\.git' + branch,
-              '^https\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools'
-                  '\\/([a-z0-9\\-_]+)' + branch,
-              '^https\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools'
-                  '\\/([a-z0-9\\-_]+)\\.git' + branch,
+              '^https?\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/'
+                  '([a-z0-9\\-_]+)(?:\\.git)?' + branch,
+              '^https?\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/'
+                  '([a-z0-9\\-_]+)(?:\\.git)?' + branch,
+              '^https?\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools'
+                  '\\/([a-z0-9\\-_]+)(?:\\.git)?' + branch,
             ],
             project_bases_verifier.project_bases)
     self.assertEqual({}, mapping)
 
 
 class ChromiumStateLoad(TestCase):
   # Load a complete state and ensure the code is reacting properly.
   def setUp(self):
     super(ChromiumStateLoad, self).setUp()
     self.buildbot = mocks.BuildbotMock(self)
@@ skipping 274 matching lines @@
     self.context.status.check_names(['initial', 'why not', 'why not',
                                      'why not', 'commit'])
 
 
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.WARNING,
       format='%(levelname)5s %(module)15s(%(lineno)3d): %(message)s')
   unittest.main()