Re: [Codestriker-user] Creating subversion diffs ignoring whitespace changes

[Keith L. <the...@gm...>]

I have tried to implement the use of gnu diff on my codestriker
installation.  I changed the Subversion.pm file from:

    $cmd = "\"$Codestriker::svn\" diff --non-interactive --no-auth-cache " .
         $self->{userCmdLine} . " -r $start_tag:$end_tag " .
              "--old \"$self->{repository_url}\" \"$module_name\"";


to:

    $cmd = "\"$Codestriker::svn\" diff --non-interactive --no-auth-cache " .
         $self->{userCmdLine} . " -r $start_tag:$end_tag " .
              "--old \"$self->{repository_url}\" --diff-cmd diff -x -uw
\"$module_name\"";

In my test, I supplied revisions that would result in a single file being
diffed.  The resultant topic had a file called 'unknown.txt' with output:

<javascript:eo('0','1','1')>
 Index: devbranches/eckml/CQ14179/grainger/script_root/jsp/profile/accountadmin/accountAdmin_body.jsp
<javascript:eo('0','2','1')>
 ===================================================================        The
output shows only the name of the file I'd expected to be diffed.

The command runs fine from the command line.  I'm wondering if there's some
PERL voodoo I don't know about.  I'm far from a PERL expert and could use
some help.

Thanks,
Keith Levy



On 8/8/06, David Sitsky <si...@us...> wrote:
>
> Looks like it is possible, but the command line needs to be modified
> further.  Check out:
>
>
> http://www.akatombo.com/index/en/comments/ignore_whitespace_in_a_subversion_diff/
>
> Cheers,
> David
>
> Moisei Rabinovich wrote:
> > Ohh, I assumed everybody knows that I use subversion not a CVS.
> > Thanks for the tip anyway, I think, know where to go now.
> > Even svn diff is missing this option natively, there is a way to use
> > 3-rd party diff that knows to ignore the white spaces.
> >
> > On 8/8/06, *David Sitsky* <si...@us...
> > <mailto:si...@us...>> wrote:
> >
> >     Moisei Rabinovich wrote:
> >      > well, I probably miss some important point.
> >      > codestriker generates a diff for me by itself, i only fill
> start-tag,
> >      > end-tag and module.
> >      > where should i set the "-b" option?
> >
> >     If you always want to ignore whitespace changes, you can do this by
> >     modifying lib/Codestriker/Repository/Cvs.pm, line 124.  Add the '-b'
> >     option so that the code that used to be:
> >
> >          my $pid = open3($write_stdin_fh, $read_stdout_fh,
> $read_stderr_fh,
> >                         $Codestriker::cvs, '-q', '-d', $self->{url},
> >                         'rdiff', $extra_options, '-u',
> >                         '-r', $start_tag, '-r', $end_tag, $module_name);
> >
> >     Looks like:
> >
> >          my $pid = open3($write_stdin_fh, $read_stdout_fh,
> $read_stderr_fh,
> >                         $Codestriker::cvs, '-q', '-d', $self->{url},
> >                         'rdiff', $extra_options, '-u', '-b',
> >                         '-r', $start_tag, '-r', $end_tag, $module_name);
> >
> >     ie - the -b option has been added.
> >
> >      > also I am not sure @exclude_file_types is taken into account in
> >     this case
> >
> >     It should be.  The same filtering code is run, regardless of whether
> or
> >     not Codestriker generated the diff text, or it was supplied by the
> >     user.
> >
> >     Cheers,
> >     David
> >
> >
> >
> >
> > --
> > Best Regards,
> > Moisei
>
>
> -------------------------------------------------------------------------
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job
> easier
> Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> Codestriker-user mailing list
> Cod...@li...
> https://lists.sourceforge.net/lists/listinfo/codestriker-user
>