Bug 363678: have fast-update use non-recursive bonsai queries for local directories. r=bsmedberg

client.mk

@@ -684,7 +684,7 @@ ifeq (,$(MOZ_MODULE_LIST_NS))
 FASTUPDATE_MODULES_NS := true
 CHECKOUT_MODULES_NS   := true
 else
-FASTUPDATE_MODULES_NS := fast_update $(filter-out mozilla/,$(CVSCO_MODULES_NS))
+FASTUPDATE_MODULES_NS := fast_update $(CVSCO_MODULES_NS)
 CHECKOUT_MODULES_NS   := cvs_co      $(CVSCO_MODULES_NS)
 endif
 
@@ -832,7 +832,6 @@ real_fast-update:
 	cd $(ROOTDIR); \
 	cvs_co $(CVSCO_NSS); \
 	cd mozilla; \
-	cvs -z3 -q -f up -l -d .; \
 	fast_update $(CVSCO_LDAPCSDK); \
 	$(FASTUPDATE_MODULES); \
 	$(FASTUPDATE_MODULES_NS); \

config/fast-update.pl

@@ -102,6 +102,9 @@ my $esc_dir = escape($dir);
 if ($dir) {
   $url .= "&dir=$esc_dir";
 }
+if ($dirlocal) {
+  $url .= "&dirtype=local";
+}
 
 print "Contacting bonsai for updates to ${module} ";
 print "on the ${branch} branch " if ($branch);
@@ -170,8 +173,7 @@ foreach $dir (sort @dirlist) {
 
       if ($dir eq $rootdir) {
         $strippeddir = ".";
-      } elsif (!$dirlocal) {
-        # for local-only updates, skip all sub-dirs
+      } else {
         $strippeddir = substr($dir,(length $rootdir) + 1 );
       }