Changeset 26516 in vbox

Timestamp:

Feb 14, 2010 9:37:33 PM (15 years ago)

Author:

vboxsync

Message:

scm: --only-svn-dirs.

Location:

trunk

Files:

• .scm-settings (modified) (3 diffs)
• src/bldprogs/scm.cpp (modified) (11 diffs)

trunk/.scm-settings

@@ -28 +28 @@
 
 #
+# Global settings.
+#
+--only-svn-dirs
+
+#
 # Directories to ignore.
 #
@@ -35 +40 @@
 #
 --filter-out-dirs  ".svn"
---filter-out-dirs  "*/out/."
+--filter-out-dirs  "*/*out*/."
 --filter-out-dirs  "*/tools/."
 --filter-out-dirs  "*/webtools/."
@@ -75 +80 @@
 --filter-out-files "*/src/VBox/HostDrivers/VBoxUSB/os2/usbcalls.h"
 --filter-out-files "*/src/VBox/RDP/x11server/Init*.c"
+--filter-out-files "*/vslick.h"
 
 

trunk/src/bldprogs/scm.cpp

@@ -208 +208 @@
     bool            fStripTrailingBlanks;
     bool            fStripTrailingLines;
+    /** Only recurse into directories containing an .svn dir.  */
+    bool            fOnlySvnDirs;
+    /**  */
     unsigned        cchTab;
-   /** Only consider files matcihng these patterns.  This is only applied to the
-    *  base names. */
+    /** Only consider files matcihng these patterns.  This is only applied to the
+     *  base names. */
     char           *pszFilterFiles;
-   /** Filter out files matching the following patterns.  This is applied to base
-    *  names as well as the aboslute paths.  */
+    /** Filter out files matching the following patterns.  This is applied to base
+     *  names as well as the aboslute paths.  */
     char           *pszFilterOutFiles;
-   /** Filter out directories matching the following patterns.  This is applied
-    *  to base names as well as the aboslute paths.  All absolute paths ends with a
-    *  slash and dot ("/.").  */
+    /** Filter out directories matching the following patterns.  This is applied
+     *  to base names as well as the aboslute paths.  All absolute paths ends with a
+     *  slash and dot ("/.").  */
     char           *pszFilterOutDirs;
 } SCMSETTINGSBASE;
@@ -245 +248 @@
     SCMOPT_STRIP_TRAILING_LINES,
     SCMOPT_NO_STRIP_TRAILING_LINES,
+    SCMOPT_ONLY_SVN_DIRS,
+    SCMOPT_NOT_ONLY_SVN_DIRS,
     SCMOPT_TAB_SIZE,
     SCMOPT_FILTER_OUT_DIRS,
@@ -349 +354 @@
     /* .fStripTrailingBlanks = */   true,
     /* .fStripTrailingLines = */    true,
+    /* .fOnlySvnDirs = */           false,
     /* .cchTab = */                 8,
     /* .pszFilterFiles = */         (char *)"",
@@ -370 +376 @@
     { "--strip-trailing-lines",             SCMOPT_STRIP_TRAILING_LINES,            RTGETOPT_REQ_NOTHING },
     { "--strip-no-trailing-lines",          SCMOPT_NO_STRIP_TRAILING_LINES,         RTGETOPT_REQ_NOTHING },
+    { "--only-svn-dirs",                    SCMOPT_ONLY_SVN_DIRS,                   RTGETOPT_REQ_NOTHING },
+    { "--not-only-svn-dirs",                SCMOPT_NOT_ONLY_SVN_DIRS,               RTGETOPT_REQ_NOTHING },
     { "--tab-size",                         SCMOPT_TAB_SIZE,                        RTGETOPT_REQ_UINT8   },
     { "--filter-out-dirs",                  SCMOPT_FILTER_OUT_DIRS,                 RTGETOPT_REQ_STRING  },
@@ -1827 +1835 @@
         case SCMOPT_NO_STRIP_TRAILING_LINES:
             pSettings->fStripTrailingLines = false;
+            return VINF_SUCCESS;
+
+        case SCMOPT_ONLY_SVN_DIRS:
+            pSettings->fOnlySvnDirs = true;
+            return VINF_SUCCESS;
+        case SCMOPT_NOT_ONLY_SVN_DIRS:
+            pSettings->fOnlySvnDirs = false;
             return VINF_SUCCESS;
 
@@ -2930 +2945 @@
                                       PSCMSETTINGS pSettingsStack, unsigned iRecursion)
 {
+    int rc;
     Assert(cchDir > 1 && pszBuf[cchDir - 1] == '.');
 
@@ -2942 +2958 @@
 
     /*
+     * Check if it's excluded by --only-svn-dir.
+     */
+    if (pSettingsStack->Base.fOnlySvnDirs)
+    {
+        rc = RTPathAppend(pszBuf, RTPATH_MAX, ".svn");
+        if (RT_FAILURE(rc))
+        {
+            RTMsgError("RTPathAppend: %Rrc\n", rc);
+            return rc;
+        }
+        if (!RTDirExists(pszBuf))
+            return VINF_SUCCESS;
+
+        Assert(RTPATH_IS_SLASH(pszBuf[cchDir]));
+        pszBuf[cchDir]     = '\0';
+        pszBuf[cchDir - 1] = '.';
+    }
+
+    /*
      * Try open and read the directory.
      */
     PRTDIR pDir;
-    int rc = RTDirOpenFiltered(&pDir, pszBuf, RTDIRFILTER_NONE);
+    rc = RTDirOpenFiltered(&pDir, pszBuf, RTDIRFILTER_NONE);
     if (RT_FAILURE(rc))
     {
@@ -3146 +3181 @@
                 g_fDryRun = true;
                 break;
-
             case 'D':
                 g_fDryRun = false;
@@ -3156 +3190 @@
 
             case 'h':
-                RTPrintf("Source Code Massager\n"
+                RTPrintf("VirtualBox Source Code Massager\n"
                          "\n"
                          "Usage: %s [options] <files & dirs>\n"
@@ -3166 +3200 @@
                     if ((s_aOpts[i].fFlags & RTGETOPT_REQ_MASK) == RTGETOPT_REQ_NOTHING)
                     {
-                        if ((fAdvanceTwo = i + 1 < RT_ELEMENTS(s_aOpts) && strstr(s_aOpts[i+1].pszLong, "-no-") != NULL))
+                        fAdvanceTwo = i + 1 < RT_ELEMENTS(s_aOpts)
+                                   && (   strstr(s_aOpts[i+1].pszLong, "-no-") != NULL
+                                       || strstr(s_aOpts[i+1].pszLong, "-not-") != NULL);
+                        if (fAdvanceTwo)
                             RTPrintf("  %s, %s\n", s_aOpts[i].pszLong, s_aOpts[i + 1].pszLong);
                         else
@@ -3183 +3220 @@
                         case SCMOPT_STRIP_TRAILING_BLANKS:  RTPrintf("      Default: %RTbool\n", g_Defaults.fStripTrailingBlanks); break;
                         case SCMOPT_STRIP_TRAILING_LINES:   RTPrintf("      Default: %RTbool\n", g_Defaults.fStripTrailingLines); break;
+                        case SCMOPT_ONLY_SVN_DIRS:          RTPrintf("      Default: %RTbool\n", g_Defaults.fOnlySvnDirs); break;
                         case SCMOPT_TAB_SIZE:               RTPrintf("      Default: %u\n", g_Defaults.cchTab); break;
                         case SCMOPT_FILTER_OUT_DIRS:        RTPrintf("      Default: %s\n", g_Defaults.pszFilterOutDirs); break;