Changeset 28081 for other-projects/nightly-tasks/diffcol

Timestamp:

2013-08-16T20:04:02+12:00 (11 years ago)

Author:

ak19

Message:

The svnaddnew flag now ensures that the cache and log folders and any earliestDatestamp files are not copied over from the local collect to the version model-collect folder before trying to add it. Have not yet included support for the svn:ignore on these items, because it's possible to have an ignorelist in a file that is applied recursively. Want to discuss this first.

File:

• other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh (modified) (6 diffs)

other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh

@@ -100 +100 @@
 }
 
+# model-collect>svn -R propset svn:ignore -F .customignore .
+# where .customignore is a file containing:
+# log
+# earliestDatestamp
+# cache
+# model-collect>svn proplist -v
+# shows the svn properties, including the svn:ignore property. So it shows what files svn will ignore
 function svn_add_new_collection () {
 
@@ -112 +119 @@
     fi
 
-    find collect/$collection -name ".svn" -type d -exec rm -rf {} \;
-    cp -r collect/$collection model-collect/$collection
-    svn add model-collect/$collection    
+    # Using rsync to copy folders while excluding files/subfolders, BUT rsync is not available on lsb
+    # http://www.linuxquestions.org/questions/linux-software-2/copy-svn-working-dir-without-svn-hidden-dirs-and-files-620586/
+    # See also http://www.thegeekstuff.com/2011/01/rsync-exclude-files-and-folders/, 
+    # section "Exclude multiple files and directories at the same time" (can also use a file to blacklist folders/files)
+
+    # need slash on end of src dir collect/$collection/ !
+    rsync -r --exclude=.svn/ --exclude=log/ --exclude=cache/ --exclude=earliestDatestamp collect/$collection/ model-collect/$collection
+
+#    find collect/$collection -name ".svn" -type d -exec rm -rf {} \;
+#    cp -r collect/$collection model-collect/$collection
+
+    # http://www.thegeekstuff.com/2010/06/bash-array-tutorial/
+#    ignorelist=('log' 'cache' 'archives/earliestDatestamp');
+#    for ignored in "${ignorelist[@]}"; do
+#   if [ -f model-collect/$collection/$ignorelist ]; then
+#       rm model-collect/$collection/$ignorelist
+#   elif [ -d model-collect/$collection/$ignorelist ]; then
+#       rm -rf model-collect/$collection/$ignorelist
+#   fi
+#    done
+
+    svn add --force model-collect/$collection
+    
+    # http://stackoverflow.com/questions/15880249/subclipse-svn-first-commit-ignore-certain-directories
+    # http://wolfram.kriesing.de/blog/index.php/2005/svnignore-and-svnkeywords
+    # http://boblet.tumblr.com/post/35755799/setting-up-and-using-svn-ignore-with-subversion
+    # http://www.petefreitag.com/item/662.cfm
+    # http://svnbook.red-bean.com/en/1.7/svn.advanced.props.special.ignore.html
+    # http://stackoverflow.com/questions/116074/how-to-ignore-a-directory-with-svn
+
+    # Dr Bainbridge's way of doing an svn ignore is better and involves fewer steps:
+    # create the empty collection folder (-p for subcollections), svn add it, 
+    # svn:ignore all the files to be ignored
+    # copy the contents of the collection across, 
+    # do an svn add --force on the collection folder
+
+    #mkdir -p model-collect/$collection
+    #svn add model-collect/$collection
+    #ignorelist=('log' 'cache' 'archives/earliestDatestamp');
+    #for ignored in "${ignorelist[@]}"; do
+    #    svn propset svn:ignore $ignorelist model-collect/$collection/.
+    #done    
+    # cp -r collect/$collection/* model-collect/$collection/*
+    #svn add --force model-collect/$collection
 }
 
@@ -228 +276 @@
     cp -r collect/$collection/index model-collect/$collection/. 
 
+    # need a --force to skip all the svn:ignored files (archives/earliestDatestamp) 
+    # when doing the recursive svn add on the archives and index directories
     if [ "$debug_mode" -eq "0" ]; then
-    svn add model-collect/$collection/archives
-    svn add model-collect/$collection/index
+    svn add --force model-collect/$collection/archives
+    svn add --force model-collect/$collection/index
     fi
 }
@@ -308 +358 @@
     # now svn add any and all the NEW items in model-collect's archives and index
     # see http://stackoverflow.com/questions/1071857/how-do-i-svn-add-all-unversioned-files-to-svn
+    # see also http://stackoverflow.com/questions/116074/how-to-ignore-a-directory-with-svn
 #    if [ "$debug_mode" -eq "0" ]; then
     svn add --force model-collect/$collection/archives/* --auto-props --parents --depth infinity -q
@@ -491 +542 @@
 fi
 
+# Not using rsync to copy folders while excluding files/subfolders, since rsync is not available on lsb
+# http://www.linuxquestions.org/questions/linux-software-2/copy-svn-working-dir-without-svn-hidden-dirs-and-files-620586/
+# rsync -r --exclude=.svn/ model-collect/ collect
+
 # Make a copy of the model-collect named as the new collect 
 # (or if collections are specified in the cmdline arguments, copy just these over from model-collect into collect)
@@ -601 +656 @@
     echo "* The model-collect folder has not been altered. Changes have only been made to collect"
 elif [ "x$mode" == "xsvnupdate" ]; then
-    echo "* TO DO: You still need to run svn status and then svn commit on the model-collect folder. Besides that:"    
+    echo "* TO DO: You still need to run svn status and svn commit on the model-collect folder. Besides that:"    
 elif [ "x$mode" == "xsvndelete" ]; then
     echo "* The model-collect folder's archives and index subfolders have been updated and committed to svn."
 elif [ "x$mode" == "xsvnaddnew" ]; then
     echo "* The new collection(s) have been built, copied to model-collect and added to svn."
+    echo "* TO DO: You still need to run svn status and svn commit on the model-collect folder. Besides that:" 
 fi
 echo