Bug 386806 - client.py script pulls from mozilla-central by default (r=luser)

client.py

@@ -9,9 +9,16 @@ NSS_DIRS  = ('dbm',
              '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'
+
 import os
 import sys
 from optparse import OptionParser
+from ConfigParser import SafeConfigParser
+import urlparse
 
 topsrcdir = os.path.dirname(__file__)
 if topsrcdir == '':
@@ -29,17 +36,21 @@ except ImportError:
                 cmd = popenargs[0]
                 raise Exception("Command '%s' returned non-zero exit status %i" % (cmd, retcode))
 
-def do_hg_pull(dir, remote, hgroot, hg):
+def check_call_noisy(cmd, *args, **kwargs):
+    print "Executing command:", cmd
+    check_call(cmd, *args, **kwargs)
+
+def do_hg_pull(dir, repository, hg):
     fulldir = os.path.join(topsrcdir, dir)
     # clone if the dir doesn't exist, pull if it does
     if not os.path.exists(fulldir):
         fulldir = os.path.join(topsrcdir, dir)
-        repository = '%s/%s' % (hgroot, remote)
+        check_call_noisy([hg, 'clone', repository, fulldir])
-        check_call([hg, 'clone', repository, fulldir])
     else:
-        repository = '%s/%s' % (hgroot, remote)
+        cmd = [hg, 'pull', '-u', '-R', fulldir]
-        cmd = [hg, 'pull', '-u', '-R', fulldir, repository]
+        if repository is not None:
-        check_call(cmd)
+            cmd.append(repository)
+        check_call_noisy(cmd)
 
 def do_cvs_checkout(modules, tag, cvsroot, cvs):
     """Check out a CVS directory.
@@ -47,39 +58,82 @@ def do_cvs_checkout(modules, tag, cvsroot, cvs):
     """
     for module in modules:
         (parent, leaf) = os.path.split(module)
-        check_call([cvs, '-d', cvsroot,
+        check_call_noisy([cvs, '-d', cvsroot,
-                    'checkout', '-P', '-r', tag, '-d', leaf,
+                          'checkout', '-P', '-r', tag, '-d', leaf,
-                    'mozilla/%s' % module],
+                          'mozilla/%s' % module],
-                   cwd=os.path.join(topsrcdir, parent))
+                         cwd=os.path.join(topsrcdir, parent))
 
 o = OptionParser(usage="client.py [options] checkout")
 o.add_option("-m", "--mozilla-repo", dest="mozilla_repo",
-             default="mozilla-central",
+             default=None,
-             help="Specify the Mozilla repository to pull from, default 'mozilla-central'")
+             help="URL of Mozilla repository to pull from (default: use hg default in .hg/hgrc)")
 o.add_option("-t", "--tamarin-repo", dest="tamarin_repo",
-             default="tamarin-central",
+             default=None,
-             help="Specify the Tamarin repository to pull from, default 'tamarin-central'")
+             help="URL of Tamarin repository to pull from (default: use hg default in js/tamarin/.hg/hgrc; or if that file doesn't exist, use \"" + DEFAULT_TAMARIN_REPO + "\".)")
 o.add_option("--hg", dest="hg", default=os.environ.get('HG', 'hg'),
              help="The location of the hg binary")
 o.add_option("--cvs", dest="cvs", default=os.environ.get('CVS', 'cvs'),
              help="The location of the cvs binary")
-o.add_option("--hgroot", dest="hgroot", default="ssh://hg.mozilla.org",
-             help="The hg root (default: ssh://hg.mozilla.org)")
 o.add_option("--cvsroot", dest="cvsroot",
              default=os.environ.get('CVSROOT', ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'),
              help="The CVSROOT (default: :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot")
 
+
+def fixup_repo_options(options):
+    """ Check options.mozilla_repo and options.tamarin_repo values;
+    populate tamarin_repo if needed.
+
+    options.mozilla_repo and options.tamarin_repo are normally None.
+    This is fine-- our "hg pull" commands will omit the repo URL.
+    The exception is the initial checkout, which does an "hg clone"
+    for Tamarin.  That command requires a repository URL.
+    """
+
+    if (options.mozilla_repo is None
+            and not os.path.exists(os.path.join(topsrcdir, '.hg'))):
+        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)
+
+
 try:
     (options, (action,)) = o.parse_args()
 except ValueError:
     o.print_help()
     sys.exit(2)
 
+fixup_repo_options(options)
+
 if action in ('checkout', 'co'):
     do_cvs_checkout(NSPR_DIRS, NSPR_CO_TAG, options.cvsroot, options.cvs)
     do_cvs_checkout(NSS_DIRS, NSS_CO_TAG, options.cvsroot, options.cvs)
-    do_hg_pull('js/tamarin', options.tamarin_repo, options.hgroot, options.hg)
+    do_hg_pull('js/tamarin', options.tamarin_repo, options.hg)
-    do_hg_pull('.', options.mozilla_repo, options.hgroot, options.hg)
+    do_hg_pull('.', options.mozilla_repo, options.hg)
 else:
     o.print_help()
     sys.exit(2)