Changeset 565

Timestamp:

12/16/2011 18:24:22 (5 months ago)

Author:

blee

Message:

Merge fix for #10 into confman-1.9.

Closes #10

Location:

branches/confman-1.9

Files:

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

branches/confman-1.9/confman.8.in

@@ -145 +145 @@
 .Nm .
 It will check out your working copy. setup takes no additional arguments.
-.It Cm update [ Ar options ]
-The update command will update all the modules in your working copy. This
-Any options specified will be passed directly to 
-.Xr svn 1 . This can be used
-for updating your working copy to an older revision. 
+.It Cm update [ -a ] [ -r Ar revision_string ] [ Ar recipe ]
+The update command will update all the modules in your working copy by default,
+or, if given a Ar recipe, update all the files relevant to the given recipe.
 
-For example, you could use `confman update -r '{20090801}' www` to look at the
-state of the module named `www' as of 1 August 2009. This will re-add any
-deleted files and delete any added files from your working copy (This is
-simplest if you have commited any outstanding changes, but subversion is good
-about not deleting work-in-progress -- the errors can just be confusing). 
+If the UPDATE_RELEVANT_ONLY flag has been set in 
+.Xr confman.conf 5 ,
+the default behavior 
+of Cm update is to update only the files relevant to the host's recipe.  
+The 
+.Fl a 
+flag will override this behavior and update the entire working copy.
+
+.Fl r Ar revision_string
+can be used, as in 
+.Xr svn 1 ,
+to retrieve an older copy of the working copy, e.g. 
+.Cm update -r PREV
+to retrieve the previous commit of the working copy.
 
 Note that before any install or commit operation, there is an implicit update
 that will cause the latest repository revision to be reflected in your working
-copy.  command does not alter the repository or the system.
+copy. This command does not alter the repository or the system.
 .It Cm commit Oo log_flags Oc
 The commit command causes your changes to take effect. 

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

@@ -203 +203 @@
 .It LIVE_ROOT
 This option causes 
-.Xr
+.Xr confman 8
 to use an alternate path to "/" for rolling out files. This is a great way
 to set up a sandbox and test things out before managing your live system.
+.It UPDATE_RELEVANT_ONLY
+Defaults to "false".  Set it to "true" to cause
+.Xr confman 8
+to update only the files relevant to the host's recipe when running a commit 
+or an install.  Additionally, 
+.Cm confman update
+will update only the recipe-relevant files when given no additional arguments.
 .El
 .Sh AUTHORS

branches/confman-1.9/confman.conf.in

@@ -106 +106 @@
 LIVE_ROOT=""
 
+# Allow svn to update only the files relevant to the recipe before a commit 
+# or install operation.
+UPDATE_RELEVANT_ONLY="false"
+

branches/confman-1.9/confman.in

@@ -100 +100 @@
 function update {
     local wcopy_lock
-    wcopy_lock=$(conf_lock_wcopy)
-    conf_update_tree "$@" || exit 1
+    local opt OPTARG OPTIND
+    local revision="HEAD" recipe update_all="false"
+    while getopts ":r:a" opt ; do
+        case $opt in
+            r)  revision="$OPTARG" ;;
+            a)  update_all="true" ;;
+            *)  echo "Invalid option '-${OPTARG}'." >&4
+                print_usage 1
+                ;;
+        esac
+    done
+    shift $(($OPTIND - 1))
+    recipe="$1"
+    wcopy_lock=$(conf_lock_wcopy)
+    $UPDATE_RELEVANT_ONLY && [ -z $recipe ] && recipe="$RECIPE_NAME"
+    if [ ! -r "$(conf_recipe_dir)/$recipe" ]; then
+        echo "Recipe \"$recipe\" does not exist or is not readable." >&2
+        exit 1
+    fi
+    if $update_all || [ -z $recipe ]; then
+        conf_update_tree -r $revision ${WORK_PATH} || exit 1
+    else
+        conf_update_relevant_tree $recipe -r $revision || exit 1
+    fi
     conf_unlock_wcopy $wcopy_lock
 }
@@ -225 +247 @@
     
     $SUDO ${SUDO:+-v}
-    conf_update_tree || conf_cleanExit
+
+    update
     
     if status=$(get_status $modules $symlinks); then
@@ -284 +307 @@
     $SUDO ${SUDO:+-v}
 
-    conf_update_tree || conf_cleanExit
+    update
     if status=$(get_status $files) ; then
         nocommit=false

branches/confman-1.9/confmandoc.sh

@@ -36 +36 @@
   $MYNAME [ help | -h ] [ command ]
   $MYNAME setup
-  $MYNAME update [ options ]
+  $MYNAME update [ -a ] [ -r revision_string ] [ recipe ]
   $MYNAME commit
   $MYNAME diff [ working_copy ]
@@ -139 +139 @@
 
 Usage:
-  $MYNAME update [ options ]
-
-With no arguments, the update command will update your working copy of all
-the modules appearing in the current host's recipe file. This command does
-not alter the repository.
-
-Any options specified will be passed directly to svn(1). This can be used
-for updating your working copy to an older revision. Note that before any
+  $MYNAME update [ -a ] [ -r revision_string ] [ recipe ]
+
+With no arguments, the update command will update your entire working copy 
+unless the UPDATE_RELEVANT_ONLY flag is set in confman.conf or your 
+~/.confmanrc.  With the UPDATE_RELEVANT_ONLY flag, the default behavior of 
+the update command is to update all of the files appearing in the current 
+host's recipe file.  With a recipe argument, the update command will update 
+all files in the working copy relevant to the recipe.  This command does not 
+alter the repository.
+
+If -r is used, confman will retrieve versions of the files indicated by 
+the revision string, e.g., -r PREV for the previous working copy.
+
+The -a option will force a full update of all files in your working copy, 
+regardless of whether UPDATE_RELEVANT_ONLY is set.  Note that before any
 install or commit operation, there is an implicit update that will cause
 the latest repository revision to be reflected in your working copy.

branches/confman-1.9/confmanlib.sh.in

@@ -130 +130 @@
         @SVN@ update "$@"
     fi
+}
+
+# Updates the relevant portions of the source tree
+function conf_update_relevant_tree {
+    local module symlink
+    local relevant_files="" recipe args
+    recipe="$1"
+    shift
+    args="$@"
+    [ -r $(conf_recipe_dir)/${recipe} ] || exit 1
+    @SVN@ update $args $(conf_recipe_dir)/${recipe}
+    if ! [[ $args =~ .*-r.* ]]; then
+        # make sure that svn is pulling the same revision everywhere
+        args="${args} -r $(@SVN@ info $(conf_recipe_dir)/${recipe} | \
+            awk '/^Revision:/ { print $2 }')"
+    fi
+    for module in $(conf_get_recipe $(conf_recipe_dir)/${recipe}); do
+        relevant_files="$relevant_files ${WORK_PATH}/${module}"
+        for symlink in $(find ${WORK_PATH}/${module} -type l); do
+            relevant_files="$relevant_files $(@GREADLINK@ -f $symlink)"
+        done
+    done
+    [ "$relevant_files" = "" ] || @SVN@ update $args $relevant_files | grep \
+        -v -e 'revision'
 }