[Csp-commits] svn:csp r1003 - trunk/CSP/tools

[<sv...@ww...>]

Author: mkrose
Date: 2004-06-07 23:11:05 -0700 (Mon, 07 Jun 2004)
New Revision: 1003

Modified:
   trunk/CSP/tools/sublib.py
   trunk/CSP/tools/subset
Log:
Fix diff path to work from subdirectories.  Also ignore whitespace
(probably should be optional...)

Modified: trunk/CSP/tools/sublib.py
===================================================================
--- trunk/CSP/tools/sublib.py	2004-06-06 22:57:19 UTC (rev 1002)
+++ trunk/CSP/tools/sublib.py	2004-06-08 06:11:05 UTC (rev 1003)
@@ -107,12 +107,12 @@
 
 
 def svn_savediff(file, target, revision=None, context=100):
-  path = file.path
+  path = file.abspath()
   if revision:
     revision = '-r %s' % revision
   else:
     revision = ''
-  exit_code, out = runo('svn diff %s --diff-cmd diff -x "-U %d" %s' % (revision, context, path))
+  exit_code, out = runo('svn diff %s --diff-cmd diff -x "-U %d -b" %s' % (revision, context, path))
   open(target, 'w').write(''.join(out))
   return exit_code
 

Modified: trunk/CSP/tools/subset
===================================================================
--- trunk/CSP/tools/subset	2004-06-06 22:57:19 UTC (rev 1002)
+++ trunk/CSP/tools/subset	2004-06-08 06:11:05 UTC (rev 1003)
@@ -577,7 +577,7 @@
     for file in cs.files():
       path = file.abspath()
       exit_code, out = sublib.runo('svn --non-interactive --diff-cmd=/usr/bin/diff'
-                                 ' --extensions=-U%d diff %s' % (context, path))
+                                   ' --extensions=-U%d diff %s' % (context, path))
       if exit_code:
         return Error('unable to diff %s' % path)