Changeset 455 for branches

Timestamp:

10/05/2009 00:20:42 (3 years ago)

Author:

blee

Message:

Merge from trunk bulk operations for create, rmmod, and recipe remove.

Fixes #72

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.8.in (modified) (1 diff)
• confman.in (modified) (3 diffs)
• confmandoc.sh (modified) (3 diffs)
• confmanlib.sh.in (modified) (5 diffs)

branches/confman-1.9/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 rmmod Ar module
-Delete the specified 
+.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 [ Ar module Ar ... ]
+Delete the modules corresponding to the specified 
 .Ar module 
-from your working copy. Follow this action with a revert or commit operation.
+arguments from your working copy. Follow this action with a revert or
+commit operation.
 .It Cm rename Ar oldmodule newmodule
 Rename 

branches/confman-1.9/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
@@ -745 +744 @@
 
 function rmmod {
-    local module=$1
-    if [ -z $module ] ; then
-        print_usage 1
-    fi
-    conf_lock_wcopy
-    conf_rmmod $module
-    conf_unlock_wcopy
+    if [ -z "$*" ] ; then
+        print_usage 1
+    else
+        conf_lock_wcopy
+        conf_remove_modules "$@" || exit 1
+        conf_unlock_wcopy
+    fi
 }
 
@@ -918 +917 @@
 
 function recipe_remove {
-    if [ -z "$1" ] ; then print_usage 1 ; fi
-    local recipe="$1"
-    conf_remove_recipe "$recipe"
+    if [ -z "$*" ] ; then print_usage 1 ; fi
+    conf_remove_recipes "$@" || exit 1
 }
 

branches/confman-1.9/confmandoc.sh

@@ -41 +41 @@
   $MYNAME audit
   $MYNAME log [ working_copy ]
-  $MYNAME create module
-  $MYNAME rmmod module
+  $MYNAME create module [ module ... ]
+  $MYNAME rmmod module [ module ... ]
   $MYNAME rename oldmodule newmodule
   $MYNAME import module livefile
@@ -102 +102 @@
 
 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
@@ -115 +116 @@
 
 Usage:
-  $MYNAME rmmod module
-This command will delete the specified module from your working copy. Use with
-care.
+  $MYNAME rmmod [ module ... ]
+
+Delete the modules corresponding to the specified module argu-
+ments from your working copy. Follow this action with a revert or
+commit operation.
+
 EOF
 ;;

branches/confman-1.9/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
@@ -680 +714 @@
 }
 
+function conf_remove_modules {
+    local module
+    local rc=0
+
+    for module in "$@"; do
+        conf_rmmod "$module" || rc=1
+    done
+
+    return $rc
+}
+
 function conf_rmmod {
-        local module=$1
-        @SVN@ rm ${WORK_PATH}/${module}
-        @SVN@ rm ${WORK_PATH}/${REPO_CHECKPTS}/${module}
+        local module="$1"
+    local dir
+    local rc=0
+
+    for dir in ${WORK_PATH}/{,${REPO_CHECKPTS}/}${module}; do
+        if ! [ -d "$dir" ]; then
+            echo "No such directory: $dir" >&2
+            rc=1
+        else
+            @SVN@ rm $dir || rc=1
+        fi
+    done
+
+    return $rc
 }
 
@@ -909 +965 @@
 }
 
+function conf_remove_recipes {
+    local recipe
+    local oldrecipes
+    local rc=0
+
+    for recipe in "$@"; do
+        if conf_remove_recipe "$recipe"; then
+            # Keep track of the recipes that were successfully removed
+            # to avoid inadvertent commits
+            if [ -z "$oldrecipes" ]; then
+                oldrecipes="$recipe"
+            else
+                oldrecipes="$oldrecipes,$recipe"
+            fi
+        else
+            rc=1
+        fi
+    done
+
+    # $oldrecipes is in the form foo,bar,baz. This eval trick forces
+    # curly brace expansion.
+    if echo "$oldrecipes" | grep -q ','; then
+        @SVN@ commit $(eval echo $(conf_recipe_dir)/{$oldrecipes}) 
+    else
+        @SVN@ commit "$(conf_recipe_dir)/$oldrecipes"
+    fi
+
+    return $rc
+}
+
 function conf_remove_recipe {
     local recipe="$1"
@@ -916 +1002 @@
         return 1
     fi
-    @SVN@ rm "${recipe_file}"
-    @SVN@ commit "${recipe_file}"
+    @SVN@ rm "${recipe_file}" || return 1
+    return 0
 }