Bug 388944 - client.py can't produce tamarin repo URL from a ssh:// hg repo URL
authorjorendorff@mozilla.com
Fri, 20 Jul 2007 14:49:16 -0400
changeset 3626 1dd3d4d3fe83076f2d1bfeb72c1c24154dc908ac
parent 3625 0f62afa8267f32bbd7ef6acf7fa739f363df78a7
child 3716 d7e93861f3f330b0411d1fc47babc60b5a5331a2
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs388944
milestone1.9a7pre
Bug 388944 - client.py can't produce tamarin repo URL from a ssh:// hg repo URL
client.py
--- a/client.py
+++ b/client.py
@@ -4,26 +4,22 @@ NSPR_CO_TAG = 'NSPRPUB_PRE_4_2_CLIENT_BR
 NSS_CO_TAG  = 'NSS_3_11_7_BETA1'
 
 NSPR_DIRS = ('nsprpub',)
 NSS_DIRS  = ('dbm',
              'security/nss',
              'security/coreconf',
              'security/dbm')
 
-# URL of the default hg repository to clone for Tamarin.  If this is a
-# relative URL, it's resolved relative to the Mozilla hg repository.
-#
-DEFAULT_TAMARIN_REPO = 'tamarin-central'
+# URL of the default hg repository to clone for Tamarin.
+DEFAULT_TAMARIN_REPO = 'http://hg.mozilla.org/tamarin-central/'
 
 import os
 import sys
 from optparse import OptionParser
-from ConfigParser import SafeConfigParser
-import urlparse
 
 topsrcdir = os.path.dirname(__file__)
 if topsrcdir == '':
     topsrcdir = '.'
 
 try:
     from subprocess import check_call
 except ImportError:
@@ -94,37 +90,17 @@ def fixup_repo_options(options):
         o.print_help()
         print
         print "*** The -m option is required for the initial checkout."
         sys.exit(2)
 
     # Handle special case: initial checkout of Tamarin.
     if (options.tamarin_repo is None
             and not os.path.exists(os.path.join(topsrcdir, 'js', 'tamarin'))):
-        # Calculate default tamarin source repository URL.
-
-        # Since DEFAULT_TAMARIN_REPO may be a relative URL, we first
-        # need to find the mozilla source repository URL, moz_repo.
-        moz_repo = options.mozilla_repo
-        if moz_repo is None:
-            cp = SafeConfigParser()
-            cp.read([os.path.join(topsrcdir, '.hg', 'hgrc')])
-            try:
-                moz_repo = cp.get("paths", "default")
-            except:
-                print ("*** Internal error: Expected to find a 'default' "
-                       "setting in the [paths] section of .hg/hgrc; "
-                       "but it's not there.")
-                raise
-
-        # Trim the standardsly-correct trailing /, if present.
-        if moz_repo.endswith('/'):
-            moz_repo = moz_repo[:-1]
-        options.tamarin_repo = urlparse.urljoin(moz_repo, DEFAULT_TAMARIN_REPO)
-
+        options.tamarin_repo = DEFAULT_TAMARIN_REPO
 
 try:
     (options, (action,)) = o.parse_args()
 except ValueError:
     o.print_help()
     sys.exit(2)
 
 fixup_repo_options(options)