[Codestriker-commits] CVS update: codestriker CHANGELOG

[<si...@us...>]

  User: sits    
  Date: 08/09/01 23:33:57

  Modified:    t/FileParser subversion.t
               lib/Codestriker/FileParser SubversionDiff.pm
               .        CHANGELOG
  Added:       test/testtopictexts svn-PropDiff9.txt
  Log:
  * Fixed a bug where Subversion diffs with binary files that contained
    property changes were not handled correctly.
  
  
  
  Index: svn-PropDiff9.txt
  ===================================================================
  RCS file: svn-PropDiff9.txt
  diff -N svn-PropDiff9.txt
  --- /dev/null	1 Jan 1970 00:00:00 -0000
  +++ svn-PropDiff9.txt	2 Sep 2008 06:33:56 -0000	1.1
  @@ -0,0 +1,26 @@
  +Index: product/lib/javamail/mail.jar
  +===================================================================
  +Cannot display: file marked as a binary type.
  +svn:mime-type = application/octet-stream
  +
  +Property changes on: product\lib\javamail\mail.jar
  +___________________________________________________________________
  +Added: svn:mime-type
  +   + application/octet-stream
  +
  +Index: buildCleanup.py
  +===================================================================
  +--- buildCleanup.py	(revision 7)
  ++++ buildCleanup.py	(revision 9)
  +@@ -28,11 +28,7 @@
  + #    GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
  + #    EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
  + 
  +-    GCOMDirectories = [ 'testdata/branches/GCOM' ]
  +-    EPRODirectories = [ 'testdata/branches/EPRODATA' ]
  +     
  +-    activeGraingerBuild = database.getActiveBuild("PRD", "gcom")
  +-    activeEPROBuild = database.getActiveBuild("PRD", "eprodata")
  + 
  +     print activeGraingerBuild.getBranchIdentifier()
  +     print activeEPROBuild.getBranchIdentifier()
  
  
  
  
  
  Index: subversion.t
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/t/FileParser/subversion.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- subversion.t	4 Aug 2008 10:33:33 -0000	1.2
  +++ subversion.t	2 Sep 2008 06:33:57 -0000	1.3
  @@ -2,7 +2,7 @@
   
   use strict;
   use Fatal qw / open close /;
  -use Test::More tests => 33;
  +use Test::More tests => 36;
   use Test::Differences;
   
   use lib '../../lib';
  @@ -149,6 +149,33 @@
   END_DELTA
   ));
   
  +assert_delta_equals('../../test/testtopictexts/svn-Propdiff9.txt',
  +    make_delta(filename => 'product/lib/javamail/mail.jar',
  +			   old_linenumber => -1,
  +			   new_linenumber => -1,
  +	           revision => '1.0',
  +	           text => '',
  +	           binary => 1),
  +    make_delta(filename => 'buildCleanup.py',
  +			   old_linenumber => '28',
  +			   new_linenumber => '28',
  +	           revision => '7',
  +	           text => <<'END_DELTA',
  + #    GCOMDirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/GCOM']
  + #    EPRODirectories = ['/usr/local/apache2/htdocs/docs', '/export/home/buildmaster/cruisecontrol/EPRODATA']
  + 
  +-    GCOMDirectories = [ 'testdata/branches/GCOM' ]
  +-    EPRODirectories = [ 'testdata/branches/EPRODATA' ]
  +     
  +-    activeGraingerBuild = database.getActiveBuild("PRD", "gcom")
  +-    activeEPROBuild = database.getActiveBuild("PRD", "eprodata")
  + 
  +     print activeGraingerBuild.getBranchIdentifier()
  +     print activeEPROBuild.getBranchIdentifier()
  +END_DELTA
  +    ));
  +
  +
   assert_delta_equals('../../test/testtopictexts/svn-look-diff1.txt',
       make_delta(filename => 't1.txt',
   	           old_linenumber => '0',
  
  
  
  
  
  Index: SubversionDiff.pm
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/lib/Codestriker/FileParser/SubversionDiff.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SubversionDiff.pm	2 Aug 2008 04:47:40 -0000	1.10
  +++ SubversionDiff.pm	2 Sep 2008 06:33:57 -0000	1.11
  @@ -86,7 +86,7 @@
   	    # removed, and what revision it is based off.
   	    $line = <$fh>;
   	    my $count = 0;
  -	    while (defined $line && $line !~ /^Index|Added|Modified|Deleted/o) {
  +	    while (defined $line && $line !~ /^Index|Added|Modified|Deleted|Property changes on:/o) {
   		$line = <$fh>;
   		$count++;
   	    }
  
  
  
  
  
  Index: CHANGELOG
  ===================================================================
  RCS file: /cvsroot/codestriker/codestriker/CHANGELOG,v
  retrieving revision 1.264
  retrieving revision 1.265
  diff -u -r1.264 -r1.265
  --- CHANGELOG	31 Aug 2008 12:02:12 -0000	1.264
  +++ CHANGELOG	2 Sep 2008 06:33:57 -0000	1.265
  @@ -31,6 +31,9 @@
     
   * Help popup text windows on the create topic and search screens
     disappear automatically when the cursor is moved off the (?) link.
  +  
  +* Fixed a bug where Subversion diffs with binary files that contained
  +  property changes were not handled correctly.  
   
   Version 1.9.6