You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by "Michael A. Smith" <ma...@apache.org> on 2002/03/13 06:51:21 UTC

Re: cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections AbstractBag.java Bag.java Closure.java DefaultMapEntry.java HashBag.java IteratorEnumeration.java MapUtils.java MultiHas

On 13 Mar 2002 mas@apache.org wrote:
>  Log:
>  Removed bad line-endings (multiple ^Ms).
[snip]
>   Revision  Changes    Path
>   1.5       +338 -338  jakarta-commons/collections/src/java/org/apache/commons/collections/AbstractBag.java

I find it interesting that cvs says the entire file changes (+338 -338),
yet if you look at the "colored diff" using viewcvs, it says "No changes"

http://cvs.apache.org/viewcvs/jakarta-commons/collections/src/java/org/apache/commons/collections/AbstractBag.java.diff?r1=1.4&r2=1.5&diff_format=h

regards,
michael


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


CVS interface

Posted by Daniel Rall <dl...@finemaltcoding.com>.
[moved to infrastructure@]

"Michael A. Smith" <ma...@apache.org> writes:

> On 13 Mar 2002 mas@apache.org wrote:
> >  Log:
>>  Removed bad line-endings (multiple ^Ms).
> [snip]
> >   Revision  Changes    Path
>>   1.5       +338 -338  jakarta-commons/collections/src/java/org/apache/commons/collections/AbstractBag.java
>
> I find it interesting that cvs says the entire file changes (+338 -338),
> yet if you look at the "colored diff" using viewcvs, it says "No changes"
>
> http://cvs.apache.org/viewcvs/jakarta-commons/collections/src/java/org/apache/commons/collections/AbstractBag.java.diff?r1=1.4&r2=1.5&diff_format=h

ViewCVS ignores whitespace by default when generating diffs.  See the
view_diff() function in lib/viewcvs.py, and the diff_format and
hr_ignore_white properties in cgi/viewcvs.conf.dist for the details.
You can take off the diff_format=h argument from the query string (or
just change the "h" to a "u") to see the unidiff in ViewCVS.

The change_summary() function of the CVSROOT/log_accum.pl script
(which is fired off by CVSROOT/loginfo) is not setup to ignore
white space.  Adding the -b option would turn that on.

                    open(DIFF, "-|")
                        || exec 'cvs', '-Qn', 'diff', '-u',
                              "-r$prev_rev", "-r$rev", $file;

It would present a more uniform (and arguably therefore more
user-friendly) interface if the default views for the ViewCVS and CVS
commit log diffs were normalized, but perhaps that's over simplifying
matters.  Thoughts?

- Dan

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>