mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-03-19 04:16 pm

[vcv] Backed out changeset 9b986132b07b

[commit: http://hg.dwscoalition.org/vcv/rev/fb385e8b48c5]

Backed out changeset 9b986132b07b

This change caused problems with diffs on files, as it generates diffs with
absolute paths. These diffs cannot then be applied accurately.

Files modified:
  • bin/vcv
--------------------------------------------------------------------------------
diff -r 9b986132b07b -r fb385e8b48c5 bin/vcv
--- a/bin/vcv	Tue Mar 17 07:11:05 2009 +0000
+++ b/bin/vcv	Thu Mar 19 16:16:48 2009 +0000
@@ -456,11 +456,9 @@ while ( @dirs ) {
 
     next if $path eq 'cvs' || $path eq 'etc' || $path eq 'logs';
     next if $checked{$path}++ > 0;
+    next unless -d $path;
 
-    my $fullpath = "$DIR_LIVE/$path";
-    next unless -d $fullpath;
-
-    opendir (MD, $fullpath) or die "Can't open $fullpath.";
+    opendir (MD, $path) or die "Can't open $path.";
     while (my $file = readdir(MD)) {
         next if $file =~ /~$/;     # ignore emacs files
         next if $file =~ /^\.\#/;  # ignore CVS archived versions
@@ -472,10 +470,10 @@ while ( @dirs ) {
 
         next if $cvspath{"$path/$file"};
 
-        if (-d "$fullpath/$file") {
+        if (-d "$path/$file") {
             next if $file eq "blib";
             unshift @dirs, "$path/$file";
-        } elsif (-f "$fullpath/$file") {
+        } elsif (-f "$path/$file") {
 
             next if @ARGV && ! grep { "$path/$file" eq $_ } @ARGV;
 
@@ -487,7 +485,7 @@ while ( @dirs ) {
 
             if ( $diff ) {
                 my $opt = $opt_ignore_space ? '-b' : '';
-                my $the_diff = `diff -u $opt /dev/null $fullpath/$file`;
+                my $the_diff = `diff -u $opt /dev/null $path/$file`;
                 print $the_diff;
             }
         }
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org