Changeset 481 for branches/confman-1.9

Timestamp:

11/11/2009 14:09:39 (2 years ago)

Author:

ccowart

Message:

Merging improved recipe creation and editing from trunk.

Resolves #83, #84

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• confman.8.in (modified) (5 diffs)
• confman.conf.5.in (modified) (1 diff)
• confman.conf.in (modified) (1 diff)
• confman.in (modified) (6 diffs)
• confmancommon.sh.in (modified) (1 diff)
• confmandoc.sh (modified) (4 diffs)
• confmanlib.sh.in (modified) (5 diffs)
• recipe.template (copied) (copied from trunk/recipe.template)

branches/confman-1.9/Makefile.am

@@ -12 +12 @@
 sysconf_DATA = confman.conf.sample
 sysconfdefaults_DATA = confman.conf
+dist_sysconfdefaults_DATA = recipe.template
 bashcomp_DATA = confman_completion
 man_MANS = confman.8 confman.conf.5

branches/confman-1.9/confman.8.in

@@ -36 +36 @@
 .Op Fl v | Cm version
 .Nm
-.Ar command Oo Ar command_opts Oc Op Ar command_args
+.Oo Ar flags Oc Ar command Oo Ar command_opts Oc Op Ar command_args
 .Sh DESCRIPTION
 The
@@ -96 +96 @@
 operations can bring the system up-to-date.
 .El
-.\" TODO
+.Ss FLAGS
+.Bl -tag -width "FLAGS "
+.It Global flags
+The following flags can be specified before the commands:
+.Bl -tag -width indent
+.It Fl h Op Ar command 
+Synonymous to the
+.Ar help
+command below.
+.It Fl v
+Causes
+.Nm
+to print the version string and exit.
+.El
+.It Log flags
+The following flags can be used where
+.Ar log_flags
+appears in the usage statements (See
+.Sx COMMANDS ) :
+.Bl -tag -width indent
+.It Fl m Ar message
+The string in the
+.Ar message
+argument will be used instead of prompting the user for a log message for
+.Cm commit
+and
+.Cm install
+operations.
+.It Fl F Ar filename
+Like
+.Fl m ,
+except the log's contents are read from
+.Ar filename
+instead of the command line.
+.El
+.El
 .Ss COMMANDS
 The following commands are supported by 
@@ -125 +160 @@
 that will cause the latest repository revision to be reflected in your working
 copy.  command does not alter the repository or the system.
-.It Cm commit
+.It Cm commit Oo log_flags Oc
 The commit command causes your changes to take effect. 
 .Bl -bullet
@@ -171 +206 @@
 working copy of
 .Ar module .
-.It Cm install Ar
+.It Cm install Oo Ar log_flags Oc Ar
 Roll out the specified working files and directories to the live filesystem.
 Note that recipe ordering will be respected, so using install in a low-priority
 module will still cause the highest priority module's copy of the file to
 ultimately be installed.
-.It Cm status [ Ar working_copy ]
+.It Cm status Oo Ar working_copy Oc
 Look at the status entries for the file or directory specified by 
 .Ar working_copy .
@@ -183 +218 @@
 .It Cm recipe 
 .Brq Cm get | list
-.It Cm recipe 
-.Brq Cm create | edit | print | remove | set 
-.Ar recipe 
+.It Cm recipe create Oo Fl R Ar filename Oc Oo Ar log_flags Oc Ar recipe
+.It Cm recipe print Ar recipe
+.It Cm recipe Bro Cm edit | remove Brc Oo Ar log_flags Oc Ar recipe 
+.It Cm recipe set Ar recipe
 .Bl -tag -width indent
 .It Cm create
 Create a recipe named 
-.Ar recipe
+.Ar recipe. 
+Use -R to specify a file with the recipe's contents to bypass interactive 
+mode.
 .It Cm edit
 Open

branches/confman-1.9/confman.conf.5.in

@@ -137 +137 @@
 .It CONF_WARNING
 This is the first line of confman banners for managed files.
+.It LOG_TEMPLATE
+If defined, the contents of this file will be the default log message visible
+in a user's editor for repository commits. This can be useful if you use
+hooks to log commits into an external issue tracker and you want to remind
+your users to fill in the ticket number.
+.It RECIPE_TEMPLATE
+When new recipes are created, the contents of this file will be used. The
+string 
+.Ar __NAME__ 
+will be replaced with the name of the recipe. This defaults to 
+@sysconfdefaultsdir@/recipe.template. 
 .It DEFAULT_MODE_DIRECTORY
 Defaults to "0555". When new directories are created in

branches/confman-1.9/confman.conf.in

@@ -45 +45 @@
 # The template for log messages
 LOG_TEMPLATE="/dev/null"
+
+# The template for new recipes
+RECIPE_TEMPLATE="@sysconfdefaultsdir@/recipe.template"
 
 # The warning message for all files

branches/confman-1.9/confman.in

@@ -111 +111 @@
 }
 
+# Either by prompting or respecting -m/-F, returns a filename on stdout
+# with a log message in it
+# $1 contains a file with the output of svn status to display in interactive
+# log messages
+#   Returns 1 if an abort was requested by the user
+#   Returns 0 if the returned filename is good for a commit
+function get_log {
+    local status="$1"
+    local finished=false
+    local ignoreline="--This line, and those below, will be ignored--"
+    local orig_log logfile
+
+    # local seems to return true, overwriting the return of the nested
+    # call for && evaluation
+    logfile=$(conf_log_message) && finished=true
+
+    if $finished ; then
+        echo "$logfile"
+        return 0
+    fi
+
+    orig_log=$(conf_tmp_file)
+    printf "\n$ignoreline\n" >> "$logfile"
+    cat "$status" >> "$logfile"
+    cp "$logfile" "$orig_log"
+
+    # I apologize for the redirect, but stdout is being written into a
+    # variable, and at least vim (probably other editors too) gets cranky when
+    # stdout doesn't go to the user. Luckily, the fork in the common section
+    # leaves a copy of the original stdout in fd 3.
+    ${EDITOR} "$logfile" >&3
+
+    while diff "$logfile" "$orig_log" >/dev/null 2>&1 ; do
+        echo "Log message unchanged. (E)dit / (a)bort / (c)ontinue?"
+        read response
+        case "$response" in
+            [cC]*)      break;;
+            [aA]*)      return 1;;
+            ""|[eE]*)   ${EDITOR} "$logfile";;
+        esac
+    done
+    rm -f "$orig_log"
+    ${sed_cmd} -i '' -e "/${ignoreline}/,\$d" "$logfile" 2>/dev/null
+    echo "$logfile"
+    return 0
+}
+
+# Arguments are full paths to files within $WORK_PATH to check via svn status.
+#   Returns 1 if the files are unchanged
+#   Returns 0 if the files are changed and prints a filename to stdout
+#     with status info suitable for log message footers
+function get_status {
+    local status=$(conf_tmp_file)
+    local ABS_WORK=$(${readlink_cmd} -m "$WORK_PATH")
+
+    # Using a subshell to preserve CWD
+    (
+        cd "$WORK_PATH"
+        until [ -z "$1" ] ; do
+            @SVN@ status "${1#${ABS_WORK}/}" >> "$status"
+            shift
+        done
+    )
+
+    if [ $(wc -l < "$status") -eq 0 ] ; then
+        rm -f "$status"
+        return 1
+    fi
+
+    echo "$status"
+    return 0
+}
+
 function commit {
-    if [ -z "$*" ] ; then
-        conf_require_recipe 
-        conf_lock_system
-        conf_lock_wcopy
-        local msg=$(conf_tmp_file)
-        local orig_msg=$(conf_tmp_file)
-        local status=$(conf_tmp_file)
-        local modules=$(conf_get_recipe | tr '\n' ',') 
-        local ignoreline="--This line, and those below, will be ignored--"
-        # Moved up per Ian's request.
-        $SUDO ${SUDO:+-v}
-        cat $LOG_TEMPLATE > $msg
-        printf "\n${ignoreline}\n" >> $msg
-        conf_get_recipe | tr ' ' '\n' | xargs -I % @SVN@ status \
-            ${WORK_PATH}/% >> $status
-                cat $status >> $msg
-        cp $msg $orig_msg
-                if [ $(wc -l < $status) -gt 0 ] ; then
-                ${EDITOR} $msg
-            if diff $msg $orig_msg >/dev/null 2>&1 ; then
-                echo "Log message unchanged. (a)bort / (C)ontinue?"
-                read response
-                if [ "${response}" = "a" ] ; then
-                    conf_unlock_wcopy
-                    conf_unlock_system
-                    return 1
-                fi
-            fi
-                fi
-                rm -f $status $orig_msg
-        ${sed_cmd} -i '' -e '/'"$ignoreline"'/,$d' $msg 2>/dev/null
-        $SUDO ${SUDO:+-v}
-
-        #Changed this from just update to fix locking issue - arjun
-        conf_update_tree || conf_cleanExit
-
-        echo "Commit operation started" >&2
-        conf_commit "$(conf_get_recipe)" $msg || return $?
-        for layer in $(conf_get_recipe) ; do
-            echo "Rolling on $layer..."
-            conf_rollout $layer || return $?
-        done
-        for file in $SINGULARITIES ; do
-            conf_assemble_sing $file || return $?
-        done
-        conf_recordAction commit
-        conf_markclean
-        echo "Commit operation finished successfully" >&2
-        rm -f $msg
-        conf_unlock_wcopy
-        conf_unlock_system
-    else
-        print_usage 1
-    fi
+    local msg status modules module modpath
+    local nocommit=true
+    local opt OPTIND OPTARG
+
+    while getopts ":m:F:" opt ; do
+        case $opt in
+            m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
+            F)  LOG_FILE="$OPTARG" ;;
+            *)  echo "Invalid option '-${OPTARG}'." >&4
+                print_usage 1
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    [ -z "$1" ] || print_usage 1
+
+    conf_require_recipe 
+    conf_lock_system
+    conf_lock_wcopy
+    
+    for module in $(conf_get_recipe) ; do
+        modpath=$(${readlink_cmd} -m ${WORK_PATH}/${module})
+        modules=${modules:+${modules} }${modpath}
+    done
+    
+    $SUDO ${SUDO:+-v}
+    conf_update_tree || conf_cleanExit
+    
+    if status=$(get_status $modules) ; then
+        nocommit=false
+        msg=$(get_log "$status") || conf_cleanExit
+        rm -f "$status"
+    fi
+    
+    $SUDO ${SUDO:+-v}
+    
+    echo "Commit operation started" >&2
+    $nocommit || conf_commit "$(conf_get_recipe)" $msg || return $?
+    for layer in $(conf_get_recipe) ; do
+        echo "Rolling on $layer..."
+        conf_rollout $layer || return $?
+    done
+    for file in $SINGULARITIES ; do
+        conf_assemble_sing $file || return $?
+    done
+    conf_recordAction commit
+    conf_markclean
+    echo "Commit operation finished successfully" >&2
+    rm -f $msg
+    conf_unlock_wcopy
+    conf_unlock_system
 }
 
@@ -171 +242 @@
 function inst {
     local file livefile
-
-    if [ -z "$*" ] ; then
-        print_usage 1
-    else
-        conf_require_recipe 
-        conf_lock_wcopy
-        conf_lock_system
-        local msg=$(conf_tmp_file)
-        local orig_msg=$(conf_tmp_file)
-        local status=$(conf_tmp_file)
-        local modules=$(conf_get_recipe | tr '\n' ',')
-        local ignoreline="---Everything after this line will be ignored---"
-        local files
-        # Moved up per Ian's request.
-        cat $LOG_TEMPLATE > $msg
-        printf "\n${ignoreline}\n" >> $msg
-        for file in "$@"; do
-            if [ -L "$file" ]; then
-                files="$files `${readlink_cmd} -m $file`"
-            fi
-            files="$files $file"
-        done
-        @SVN@ status $files >> $status
-        cat $status >> $msg
-        cp $msg $orig_msg
-        if [ $(wc -l < $status) -gt 0 ] ; then
-            ${EDITOR} $msg
-            if diff $msg $orig_msg >/dev/null 2>&1 ; then
-                echo "Log message unchanged. (a)bort / (C)ontinue?"
-                read response
-                if [ "${response}" = "a" ] ; then
-                    conf_unlock_wcopy
-                    conf_unlock_system
-                    return 1
-                fi
-            fi
-        fi
-        rm $status $orig_msg
-        ${sed_cmd} -i '' -e '/'"$ignoreline"'/,$d' $msg 2>/dev/null
-        $SUDO ${SUDO:+-v}
-        #changed from update to conf_update_tree to implement locking - arjun
-        conf_update_tree || conf_cleanExit
-
-        echo "Installation operation started." >&2
-        conf_commit_file "$msg" "$files" || return $?
-        for layer in $(conf_get_recipe) ; do
-            conf_install $layer "$@"
-        done
-        for file in $SINGULARITIES ; do
-            conf_assemble_sing $file || conf_cleanExit
-        done
-        conf_recordAction install
-        if ! conf_isclean ; then
-            echo "WARNING: Recent 'install' operations prevented a 'sync'" >&2
-            echo "Running a 'commit' is highly recommended." >&2
-        fi
-        echo "Installation operation succeeded." >&2
-        conf_unlock_wcopy
-        conf_unlock_system
-    fi
+    local msg status files file
+    local nocommit=true
+    local opt OPTIND OPTARG
+
+    while getopts ":m:F:" opt ; do
+        case $opt in
+            m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
+            F)  LOG_FILE="$OPTARG" ;;
+            *)  echo "Invalid option '-${OPTARG}'." >&4
+                print_usage 1
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    conf_require_recipe 
+    conf_lock_wcopy
+    conf_lock_system
+    
+    for file in "$@"; do
+        files="${files:+${files} }$(${readlink_cmd} -m "$file")"
+    done
+    
+    
+    $SUDO ${SUDO:+-v}
+    conf_update_tree || conf_cleanExit
+    
+    if status=$(get_status $files) ; then
+        nocommit=false
+        msg=$(get_log "$status") || conf_cleanExit
+        rm -f "$status"
+    fi
+    
+    echo "Installation operation started." >&2
+    $nocommit || conf_commit_file "$msg" "$files" || return $?
+    for layer in $(conf_get_recipe) ; do
+        conf_install $layer "$@"
+    done
+    for file in $SINGULARITIES ; do
+        conf_assemble_sing $file || conf_cleanExit
+    done
+    conf_recordAction install
+    if ! conf_isclean ; then
+        echo "WARNING: Recent 'install' operations prevented a 'sync'" >&2
+        echo "Running a 'commit' is highly recommended." >&2
+    fi
+    echo "Installation operation succeeded." >&2
+    conf_unlock_wcopy
+    conf_unlock_system
 }
         
@@ -894 +954 @@
 
 function recipe_edit {
+    local recipe
+    local new_recipe_file recipe_file
+    local repeat msg status
+    local opt OPTIND OPTARG
+
+    while getopts ":m:F:" opt ; do
+        case $opt in
+            m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
+            F)  LOG_FILE="$OPTARG" ;;
+            *)  echo "Invalid option '-${OPTARG}'." >&4
+                print_usage 1
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
     if [ -z "$1" ] ; then print_usage 1 ; fi
-    local recipe="$1"
-    local recipe_file=$(conf_tmp_file)
-    cat "$(conf_recipe_dir)/${recipe}" > "$recipe_file"
-    $EDITOR "$recipe_file"
-    for module in $(conf_get_recipe ${recipe_file}) ; do
-        if ! [ -d "${WORK_PATH}/${module}" ] ; then
-            echo "Error: recipe references non-existent module $module" >&2
+
+    conf_lock_wcopy
+    recipe="$1"
+    recipe_file=$(conf_recipe_dir)/${recipe}
+    new_recipe_file=$(conf_tmp_file)
+
+    cat "$recipe_file" > "$new_recipe_file"
+    $EDITOR "$new_recipe_file"
+    until conf_recipe_verify "$new_recipe_file" ; do
+        echo -n "(E)dit / (c)ancel? "
+        read repeat
+        case "$repeat" in
+            [Cc]*)  return 1;; 
+            *)      $EDITOR "$new_recipe_file";;
+        esac
+    done
+
+    cat "$new_recipe_file" > "$recipe_file"
+
+    if status=$(get_status "${recipe_file#${WORK_PATH}/}") ; then
+        msg=$(get_log "$status") || return 1
+        conf_commit_recipe "$msg" "$recipe" 
+    fi
+    rm -f "$new_recipe_file"
+    conf_unlock_wcopy
+}
+
+function recipe_create {
+    local recipe recipe_file opt OPTIND msg status
+    while getopts ":m:F:R:" opt ; do
+        case $opt in
+            R)  new_recipe_file="$OPTARG" ;;
+            m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
+            F)  LOG_FILE="$OPTARG" ;;
+            *)  echo "Invalid option '-${OPTARG}' for recipe create." >&4
+                print_usage 1 
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    eval recipe=$1
+
+    if [ -z "$recipe" ] ; then 
+        print_usage 1 
+    fi
+
+    conf_lock_wcopy
+    recipe_file=$(conf_recipe_dir)/${recipe}
+    conf_recipe_create "$recipe" || return 1
+
+    if [ -z "$new_recipe_file" ] ; then
+        if ! recipe_edit "$recipe" ; then
+            conf_rm_file --force "${new_recipe_file}"
+            conf_unlock_wcopy
             return 1
         fi
-    done
-    conf_update_recipe "$recipe" "$recipe_file"
-    rm -f "$recipe_file"
-}
-
-function recipe_create {
-    if [ -z "$1" ] ; then print_usage 1 ; fi
-    local recipe="$1"
-    conf_recipe_create "$recipe"
-    recipe_edit "$recipe"
+        conf_unlock_wcopy
+        return 0
+    fi
+
+    if conf_recipe_verify "$new_recipe_file" ; then
+        cp "$new_recipe_file" "$recipe_file"
+        if status=$(get_status "${recipe_file#${WORK_PATH}/}") ; then
+            msg=$(get_log "$status") || return 1
+            conf_commit_recipe "$msg" "$recipe" 
+        fi
+        conf_unlock_wcopy
+        return 0
+    else
+        conf_rm_file --force "${recipe_file}"
+        conf_unlock_wcopy
+        return 1
+    fi
 }
 
 function recipe_remove {
-    if [ -z "$*" ] ; then print_usage 1 ; fi
+    local opt OPTIND OPTARG
+    local msg status recipes recipe
+    local nocommit=true
+    while getopts ":m:F:" opt ; do
+        case $opt in
+            m)  LOG_MESSAGE="$OPTARG"; LOG_MESSAGE_SET="true" ;;
+            F)  LOG_FILE="$OPTARG" ;;
+            *)  echo "Invalid option '-${OPTARG}'." >&4
+                print_usage 1
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+
+    conf_lock_wcopy
+
     conf_remove_recipes "$@" || exit 1
+
+    for recipe in "$@" ; do
+        recipes="${recipes:+${recipes} }$(conf_recipe_dir)/${recipe}"
+    done
+
+    if status=$(get_status $recipes) ; then
+        nocommit=false
+        msg=$(get_log "$status") || conf_cleanExit
+        rm -f "$status"
+    fi
+
+    $nocommit || conf_commit_recipes "$msg" "$@"
+
+    conf_unlock_wcopy
 }
 
@@ -935 +1095 @@
         exit 1
     fi
+    conf_lock_wcopy
+    conf_lock_system
     conf_set_recipe "$recipe"
+    conf_unlock_system
+    conf_unlock_wcopy
 }
 
@@ -949 +1113 @@
     
 function recipe_list {
-    cd $(conf_recipe_dir)
-    ls
+    (
+        cd $(conf_recipe_dir)
+        ls
+    )
 }
 
@@ -973 +1139 @@
 
 # Debug mode?
-while getopts "hdv-" opt ; do
+while getopts ":h:dv-" opt ; do
         case $opt in
-                d) DEBUG="true" ; shift ;;
-        h) shift ; print_help "$@" ; conf_cleanExit 0 ;;
+                d) DEBUG="true" ;;
+        h) print_help "$OPTARG" ; conf_cleanExit 0 ;;
         v) print_version ; conf_cleanExit 0 ;;
-                *) print_usage 1 ;;
+                *) echo "Invalid options '-${OPTARG}'." >&4
+           print_usage 1 
+           ;;
         esac
 done
 
+# Argument checking
+if [ -n "$LOG_FILE" ] && ! [ -r "$LOG_FILE" ] ; then
+    echo "Log file $LOG_FILE does not exist or is not readable." >&4
+    conf_cleanExit 1
+fi
+
+if $LOG_MESSAGE_SET && [ -n "$LOG_FILE" ] ; then
+    echo "Cannot specify both a message with -m and a file with -F." >&4
+    conf_cleanExit 1
+fi
+
 # Dispatch the subcommand. This must happen last and in the global context.
-subcommand=$1
-shift
+eval subcommand=\$$OPTIND
+shift $OPTIND
+
 trap "conf_interrupt_trap" HUP INT QUIT TERM
 case $subcommand in

branches/confman-1.9/confmancommon.sh.in

@@ -40 +40 @@
 # we re-spawn confman inside a pipe.
 if (true >&5) 2>/dev/null ; then
-        exec 4>&2 2>&5 >&3-
+        exec 4>&2 2>&5 >&3
 else
         exec 3>&1

branches/confman-1.9/confmandoc.sh

@@ -224 +224 @@
 
 Usage:
-  $MYNAME commit
+    $MYNAME commit [ -F filename | -m message ]
 
 The commit command causes your changes to take effect. This means that
@@ -238 +238 @@
 ORDER OF APPEARANCE.
 
+If -F or -m are used, the log message will be read from the filename or
+the commandline, respectively, instead of prompting the user.
+
 EOF
 ;;
@@ -257 +260 @@
 
 Usage:
-  $MYNAME install workingfile [ workingfile ... ]
+    $MYNAME install [-F filename | -m message] workingfile [workingfile [...]]
 
 The install subcommand allows you to roll out a single file from your working
 copy.
+
+If -F or -m are used, the log message will be read from the filename or
+the commandline, respectively, instead of prompting the user.
 
 EOF
@@ -495 +501 @@
 Usage:
   $MYNAME recipe [ get | list ]
-  $MYNAME recipe [ create | edit | print | remove | set ] recipe_name
+  $MYNAME recipe set recipe_name
+  $MYNAME recipe [ create | edit | remove ] [ -F file | -m msg ] recipe_name
 
 The recipe command provides an interface to manage confman recipes.

branches/confman-1.9/confmanlib.sh.in

@@ -32 +32 @@
 WCOPY_DIRTY="false"
 CONF_EXPORT="false"
+LOG_MESSAGE_SET="false"
 
 VERSION='@VERSION@'
@@ -698 +699 @@
 
 function conf_rm_file {
-        @SVN@ rm $*
+        @SVN@ rm "$@"
 }
 
@@ -963 +964 @@
         return 1
     fi
-    touch "$recipe_file"
+    ${sed_cmd} -e "s:__NAME__:${recipe}:" $RECIPE_TEMPLATE > "$recipe_file"
     @SVN@ add "$recipe_file"
 }
 
-function conf_update_recipe {
-    local recipe="$1"
-    local recipe_file="$2"
-    cat "$recipe_file" > "$(conf_recipe_dir)/${recipe}"
-    @SVN@ commit "$(conf_recipe_dir)/${recipe}"
+function conf_recipe_verify {
+    local recipe_file="$1"
+    local module
+    for module in $(conf_get_recipe ${recipe_file}) ; do
+        if ! [ -d "${WORK_PATH}/${module}" ] ; then
+            echo "Error: recipe references non-existent module $module" >&2
+            return 1
+        fi
+    done
+    return 0
+}
+
+function conf_commit_recipes {
+    local recipe recipes
+
+    local logfile="$1"
+    shift
+
+    for recipe in "$@" ; do
+        recipes="${recipes:+${recipes} }$(conf_recipe_dir)/${recipe}"
+    done
+
+    @SVN@ commit -F "$logfile" $recipes
 }
 
 function conf_remove_recipes {
-    local recipe
+    local recipe recipe_file
     local oldrecipes
     local rc=0
@@ -981 +1000 @@
     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
+            recipe_file="$(conf_recipe_dir)/${recipe}"
+            oldrecipes="${oldrecipes:+${oldrecipes} }${recipe_file}"
         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
@@ -1012 +1018 @@
     fi
     @SVN@ rm "${recipe_file}" || return 1
+    return 0
+}
+
+# Implements logic for selecting logfile based on -m/-F or interactive mode
+#   Returns 0 if the log is "complete", 1 if the log needs editing
+#   Prints filename containing the log on stdout
+function conf_log_message {
+    local logfile
+
+    if [ -n "$LOG_FILE" ] ; then
+        echo "$LOG_FILE"
+        return 0
+    fi
+    
+    logfile=$(conf_tmp_file)
+    echo "$logfile"
+
+    if $LOG_MESSAGE_SET ; then
+        echo "$LOG_MESSAGE" > "$logfile"
+    else
+        cat "$LOG_TEMPLATE" > "$logfile"
+        return 1
+    fi
     return 0
 }