Changeset 572

Timestamp:

12/19/2011 18:16:30 (5 months ago)

Author:

ccowart

Message:

Having confman report its version as part of the commit.

See #152.

File:

• trunk/confmanlib.sh.in (modified) (8 diffs)

trunk/confmanlib.sh.in

@@ -100 +100 @@
 }
 
+function conf_svncommit {
+    @SVN@ commit --with-revprop "confman:version=$VERSION" "$@"
+}
+
 # Checks out the conf tree if we don't already have it. Updates it if we do.
 function conf_checkout_tree {
@@ -278 +282 @@
     # curly brace expansion.
     if echo "$newmodules" | grep -q ','; then
-        @SVN@ commit $(eval echo ${WORK_PATH}/{$newmodules}) \
+        conf_svncommit $(eval echo ${WORK_PATH}/{$newmodules}) \
             $(eval echo ${WORK_PATH}/${REPO_CHECKPTS}/{$newmodules}) -m \
             "Created directory structure for $newmodules"
@@ -284 +288 @@
         # We test -n for this case because $newmodules might
         # be empty, i.e. no new modules were created
-        @SVN@ commit ${WORK_PATH}/$newmodules \
+        conf_svncommit ${WORK_PATH}/$newmodules \
             ${WORK_PATH}/${REPO_CHECKPTS}/$newmodules -m \
             "Created directory structure for $newmodules"
@@ -319 +323 @@
     done
 
-    @SVN@ commit -F "$msg" $files
+    conf_svncommit -F "$msg" $files
 }
 
@@ -853 +857 @@
         @SVN@ add $chkpath
         local msg="Created a checkpoint, ${checkpoint} for ${module} --`whoami`"
-        @SVN@ commit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg"
+        conf_svncommit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg"
 }
 
@@ -864 +868 @@
         @SVN@ rm ${chkpath}
         local msg="Removed the checkpoint ${checkpoint} from ${module} --`whoami`"
-        @SVN@ commit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg"
+        conf_svncommit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg"
 }
 
@@ -1033 +1037 @@
     done
 
-    @SVN@ commit -m "Renaming ${oldmod} to ${newmod}" \
+    conf_svncommit -m "Renaming ${oldmod} to ${newmod}" \
         ${WORK_PATH}/${oldmod} ${WORK_PATH}/${REPO_CHECKPTS}/${oldmod} \
         ${WORK_PATH}/${newmod} ${WORK_PATH}/${REPO_CHECKPTS}/${newmod} \
@@ -1262 +1266 @@
     done
 
-    @SVN@ commit -F "$logfile" $recipes
+    conf_svncommit -F "$logfile" $recipes
 }