Changeset 418

Timestamp:

09/18/2009 13:09:36 (3 years ago)

Author:

ccowart

Message:

Merging update enhancement from trunk.

Fixes #60

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• confman.8.in (modified) (1 diff)
• confman.in (modified) (1 diff)
• confmandoc.sh (modified) (2 diffs)
• confmanlib.sh.in (modified) (1 diff)

branches/confman-1.9/Makefile.am

@@ -1 +1 @@
 BASH = @BASH_SHELL@
-
-VERSION += (397)
 
 bashcompdir = $(sysconfdir)/bash_completion.d

branches/confman-1.9/configure.ac

@@ -1 +1 @@
 AC_PREREQ(2.62)
-AC_INIT([confman], [1.9.a], [confman-users@timesinks.net])
+AC_INIT([confman], [1.9.2b], [confman-users@timesinks.net])
 AM_INIT_AUTOMAKE([foreign])
 

branches/confman-1.9/confman.8.in

@@ -110 +110 @@
 .Nm .
 It will check out your working copy. setup takes no additional arguments.
-.It Cm update
+.It Cm update [ Ar options ]
 The update command will update all the modules in your working copy. This
-command does not alter the repository or the system.
+Any options specified will be passed directly to 
+.Xr svn 1 . This can be used
+for updating your working copy to an older revision. 
+
+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). 
+
+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.
 .It Cm commit
 The commit command causes your changes to take effect. 

branches/confman-1.9/confman.in

@@ -98 +98 @@
 
 function update {
-    if [ -z "$*" ] ; then
-        conf_lock_wcopy
-            conf_update_tree || exit 1
-        conf_unlock_wcopy
-    else
-            print_usage 1
-    fi
+    conf_lock_wcopy
+    conf_update_tree "$@" || exit 1
+    conf_unlock_wcopy
 }
 

branches/confman-1.9/confmandoc.sh

@@ -36 +36 @@
   $MYNAME [ help | -h ] [ command ]
   $MYNAME setup
-  $MYNAME update
+  $MYNAME update [ options ]
   $MYNAME commit
   $MYNAME diff [ working_copy ]
@@ -135 +135 @@
 
 Usage:
-  $MYNAME update
-
-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.
+  $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
+install or commit operation, there is an implicit update that will cause
+the latest repository revision to be reflected in your working copy.
 
 EOF

branches/confman-1.9/confmanlib.sh.in

@@ -117 +117 @@
 # Updates the whole source tree
 function conf_update_tree {
-        @SVN@ update ${WORK_PATH}
+    if [ -z "$*" ] ; then
+        @SVN@ update ${WORK_PATH}
+    else
+        @SVN@ update "$@"
+    fi
 }