Changeset 923

Timestamp:

Dec 1, 2009, 1:22:20 PM (14 years ago)

Author:

Peter Johansson

Message:

refs #380. Change back to --root (and -r).

File:

• trunk/bin/svndigest-copy-cache.as (modified) (5 diffs)

trunk/bin/svndigest-copy-cache.as

@@ -32 +32 @@
 Mandatory arguments to long options are mandatory for short options too.
   -h, --help            print this help and exit
-      --source=SRC      svn wc cache is copied from
+  -r  --root=ROOT       svn wc cache is copied from
   -t, --target=TARGET   svn wc cache is copied to
       --version         print version and exit
@@ -51 +51 @@
           [--help | -h], [AS_ECHO(["$usage"]); AS_EXIT([0])],
           [--version], [AS_ECHO(["$version"]); AS_EXIT([0])],
-          [--source], [
+          [--root | -r], [
             AS_IF([test $# = 1],  
                   [AS_ERROR([option `--root' needs an argument], [1])])
             # restore font-lock `
-            srcdir=$2
+            rootdir=$2
             shift
           ],
-          [--source=*], [
-            srcdir=$optarg 
+          [--root=*], [
+            rootdir=$optarg 
             shift
           ],
@@ -78 +78 @@
 # set default values
 AS_VAR_SET_IF([targetdir],[],[targetdir=.])
-AS_VAR_SET_IF([srcdir],[],[srcdir=.])
+AS_VAR_SET_IF([rootdir],[],[rootdir=.])
 
 # some simple sanity checking
-AS_IF([test -d "$srcdir"],[],
- [AS_ERROR([\`$srcdir' is not a directory], [1])])
+AS_IF([test -d "$rootdir"],[],
+ [AS_ERROR([\`$rootdir' is not a directory], [1])])
 # restore font-lock '
     
@@ -96 +96 @@
 # Do the actual copying
 echo find files
-files=`cd $srcdir && find . -name "*.svndigest-cache"`
+files=`cd $rootdir && find . -name "*.svndigest-cache"`
 for file in $files; do
   mother=`AS_DIRNAME([$file])`
   mother_base=`AS_BASENAME([$mother])`
   # ignore files whose mother is not named .svndigest', which implies
-  # we also ignore '$srcdir/foo.svndigest-cache' when $srcdir is
+  # we also ignore '$rootdir/foo.svndigest-cache' when $rootdir is
   # '.svndigest' because mother will be euqal to '.' in this
   # case. This is the desired behavior because file 'foo' (which
-  # 'foo.svndigest-cache' reflects) resides in '$srcdir/..' which
+  # 'foo.svndigest-cache' reflects) resides in '$rootdir/..' which
   # is outside the tree we are expected to copy.
   AS_VAR_IF([mother_base], [.svndigest], [
@@ -111 +111 @@
     AS_IF([test -d "$targetdir/$grandma"], [
       AS_MKDIR_P(["$targetdir/$mother"])
-      cp -v "$srcdir/$file" "$targetdir/$file" || AS_EXIT([1])
+      cp -v "$rootdir/$file" "$targetdir/$file" || AS_EXIT([1])
     ], [
       AS_ERROR([$targetdir/$grandma: No such directory], [1])