Changeset 451 for trunk

Timestamp:

10/04/2009 23:15:24 (3 years ago)

Author:

blee

Message:

Implement bulk operations for confman create.

See #72

Location:

trunk

Files:

• confman.8.in (modified) (1 diff)
• confman.in (modified) (1 diff)
• confmandoc.sh (modified) (2 diffs)
• confmanlib.sh.in (modified) (2 diffs)

trunk/confman.8.in

@@ -150 +150 @@
 Displays the log entires for the file or directory specified by 
 .Ar working_copy .
-.It Cm create Ar module
-A new module, named 
-.Ar module , 
-will appear as a top-level-directory in your working copy. This change will
-also be committed to the repository at the same time.
+.It Cm create Ar module [ Ar module Ar ... ]
+Creates one or more modules for the
+.Ar module
+arguments provided.  New modules will appear in the top-level-directory of
+your working copy.  This change will also be committed to the repository
+at the same time.
 .It Cm rmmod Ar module
 Delete the specified 

trunk/confman.in

@@ -90 +90 @@
     else
         conf_lock_wcopy
-        local module=$1
-        conf_create_module $module || exit 1
+        conf_create_modules "$@" || exit 1
         conf_unlock_wcopy
     fi

trunk/confmandoc.sh

@@ -41 +41 @@
   $MYNAME audit
   $MYNAME log [ working_copy ]
-  $MYNAME create module
+  $MYNAME create module [ module ... ]
   $MYNAME rmmod module
   $MYNAME rename oldmodule newmodule
@@ -100 +100 @@
 
 Usage:
-  $MYNAME create module
-
-The create command will cause a new module, named module, to appear as a
-top-level-directory in your working copy. This change will also be made to
-the repositry at the same time. 
+  $MYNAME create module [ module ... ]
+
+Creates one or more modules for the module arguments provided.
+New modules will appear in the top-level-directory of your work-
+ing copy.  This change will also be committed to the repository
+at the same time.
 
 EOF

trunk/confmanlib.sh.in

@@ -165 +165 @@
 }
 
+function conf_create_modules {
+    local module
+    local newmodules
+    local rc=0
+
+    for module in "$@"; do
+        if conf_create_module "$module"; then
+            # Keep track of the modules that were successfully created
+            # avoid inadvertently committing outstanding changes to
+            # pre-existing modules
+            if [ -z "$newmodules" ]; then
+                newmodules="$module"
+            else
+                newmodules="$newmodules,$module"
+            fi
+        else
+            rc=1
+        fi
+    done
+
+    # $newmodules is in the form foo,bar,baz. This eval trick forces
+    # curly brace expansion.
+    if echo "$newmodules" | grep -q ','; then
+        @SVN@ commit $(eval echo ${WORK_PATH}/{$newmodules}) \
+            $(eval echo ${WORK_PATH}/${REPO_CHECKPTS}/{$newmodules}) -m \
+            "Created directory structure for $newmodules --`whoami`"
+    elif [ -n "$newmodules" ]; then
+        # We test -n for this case because $newmodules might
+        # be empty, i.e. no new modules were created
+        @SVN@ commit ${WORK_PATH}/$newmodules \
+            ${WORK_PATH}/${REPO_CHECKPTS}/$newmodules -m \
+            "Created directory structure for $newmodules --`whoami`"
+    fi
+
+    return $rc
+}
+
 # Assumes that we already have core setup in our work path.
 function conf_create_module {
@@ -177 +214 @@
     @SVN@ mkdir ${WORK_PATH}/$module
     @SVN@ mkdir ${WORK_PATH}/${REPO_CHECKPTS}/$module
-    @SVN@ commit ${WORK_PATH}/${module} \
-        ${WORK_PATH}/${REPO_CHECKPTS}/$module -m \
-        "Created directory structure for ${module} --`whoami`"
 
     return 0