Bug 1126607, part 3: Stop downloading the LDAP C-SDK repository, r=gl…

…andium.

No attempt is made to clean up existing repositories, and this file could
probably be cleaned up further; such changes are beyond the scope of this bug.

client.py

@@ -10,15 +10,11 @@
 # Repo Defaults
 # 'REV' controls the default rev for All the various repo's
 # Define x_REV to override. Where x can be one of:
-#  "COMM", "MOZILLA", "CHATZILLA", "INSPECTOR", "LDAPSDKS"
+#  "COMM", "MOZILLA", "CHATZILLA", "INSPECTOR"
 DEFAULTS = {
     # Global Default Revision
     'REV': "default",
 
-    # LDAPSDKS
-    'LDAPSDKS_REPO': 'https://hg.mozilla.org/projects/ldap-sdks/',
-    'LDAPSDKS_REV': 'LDAPCSDK_6_0_7H_RTM',
-
     # URL of the default hg repository to clone for ChatZilla.
     'CHATZILLA_REPO': 'https://hg.mozilla.org/chatzilla/',
     # The stable revision to use for the next branch
@@ -36,7 +32,6 @@
 REPO_SHORT_NAMES = {
     'mozilla-central':  'moz',
     'dom-inspector':    'dom',
-    'ldap-sdks':        'ldap',
 }
 
 
@@ -409,7 +404,6 @@ def do_apply_patches(topsrcdir, hg):
         'mozilla': 'mozilla',
         'chatzilla': os.path.join('mozilla', 'extensions', 'irc'),
         'inspector': os.path.join('mozilla', 'extensions', 'inspector'),
-        'ldap':      os.path.join('ldap', 'sdks'),
     }
 
     for prefix in prefix_map.keys():
@@ -455,16 +449,6 @@ def do_apply_patches(topsrcdir, hg):
              default=None,
              help="Revision of DOM Inspector repository to update to. Default: \"" + get_DEFAULT_tag('INSPECTOR_REV') + "\"")
 
-o.add_option("--ldap-repo", dest="ldap_repo",
-             default=None,
-             help="URL of LDAP repository to pull from (default: use hg default in ldap/sdks/.hg/hgrc; or if that file doesn't exist use \"" + DEFAULTS['LDAPSDKS_REPO'] + "\".)")
-o.add_option("--skip-ldap", dest="skip_ldap",
-             action="store_true", default=False,
-             help="Skip pulling the LDAP repository.")
-o.add_option("--ldap-rev", dest="ldap_rev",
-             default=None,
-             help="Revision of LDAP repository to update to. Default: \"" + get_DEFAULT_tag('LDAPSDKS_REV') + "\"")
-
 o.add_option("--chatzilla-repo", dest="chatzilla_repo",
              default=None,
              help="URL of ChatZilla repository to pull from (default: use hg default in mozilla/extensions/irc/.hg/hgrc; or if that file doesn't exist, use \"" + DEFAULTS['CHATZILLA_REPO'] + "\".)")
@@ -609,21 +593,6 @@ def fixup_inspector_repo_options(options):
         options.inspector_rev = get_DEFAULT_tag("INSPECTOR_REV")
 
 
-def fixup_ldap_repo_options(options):
-    """Handle special case: initial checkout of LDAP.
-
-    See fixup_comm_repo_options().
-    """
-
-    # No cvs backup needed as LDAP directory name changed when it moved to hg
-    if options.ldap_repo is None and \
-            not os.path.exists(os.path.join(topsrcdir, 'ldap', 'sdks')):
-        options.ldap_repo = DEFAULTS['LDAPSDKS_REPO']
-
-    if options.ldap_rev is None:
-        options.ldap_rev = get_DEFAULT_tag("LDAPSDKS_REV")
-
-
 def get_last_known_good_mozilla_rev():
     kg_url = "http://build.mozillamessaging.com/buildbot/production/known-good-revisions/mozilla-central.txt"
     try:
@@ -645,8 +614,7 @@ def get_last_known_good_mozilla_rev():
 if options.default_rev:
     # We now wish to override all the DEFAULTS.
     DEFAULTS['REV'] = options.default_rev
-    for index in ['CHATZILLA', 'INSPECTOR', 'COMM', 'MOZILLA',
-                  'LDAPSDKS']:
+    for index in ['CHATZILLA', 'INSPECTOR', 'COMM', 'MOZILLA']:
         index += "_REV"
         # Clear the rest from file-defaults
         if index in DEFAULTS:
@@ -687,11 +655,6 @@ def get_last_known_good_mozilla_rev():
         do_hg_pull(os.path.join('mozilla', 'extensions', 'inspector'),
                    options.inspector_repo, options.hg, options.inspector_rev)
 
-    if not options.skip_ldap:
-        fixup_ldap_repo_options(options)
-        do_hg_pull(os.path.join('ldap', 'sdks'), options.ldap_repo, options.hg,
-                   options.ldap_rev)
-
     if options.apply_patches:
         do_apply_patches(topsrcdir, options.hg)