Re: [viewvc-users] Questions with 1.1.5

Ron Buchholz wrote:
> Diffs Between: Use Text Field 1.8 and Use Text Field 1.1
> 
> 1) When 'Type of Diff should be "Full Colored Diff"', clicking on "Get Diffs", produces a page with -No Changes-.
> 2) When 'Type of Diff should be "Long Colored Diff"', I don't need to click on "Get Diffs", but it produces a page w/ some colored changes.
> 3) Going back and setting 'Type of Diff should be "Colored Diff"', results are provided.
> Every setting produces output except for the "Full Colored Diff".
> 
> Now going up to rev 1.8 and hovering over the "selected" link produces this:
> http://servername/viewvc/repositoryname/modulename/filename.h?r1=1.8&view=log
> I now click 'select for diffs'
> 
> I go to file rev 1.1 at the bottom and I note that I have 2 choices:
> Diff to 'selected 1.8' (it's a link) and there is also a "(colored)" link
> 
> The link for 'selected 1.8' is:
> http://servername/viewvc/repositoryname/modulename/filename.h?r1=1.8&r2=1.1
> 
> The link for '(colored)' is:
> http://servername/viewvc/repositoryname/modulename/filename.h?r1=1.8&r2=1.1&diff_format=h
> 
> Again, clicking on the 'selected 1.8' link reveals no changes, but clicking on '(colored)' produces some diffs.
> 
> The 'type of diff' on the results page is 'Full Colored Diff'. Changing it to anything else will produce results - just not 'Full Colored Diff'.
> 
> Q: I am assuming that "Full Colored Diff" means that the full length of the files will be shown with coloring. True?

Yes, "Full Colored Diff" is supposed to show all the file contents, with
colored differences.

I still can't get anything of this sort to happen, *but* I just noticed from
your original message that you're using CVSNT.  I am not.  The ViewVC
codebase communicates your desire for a full colored diff by passing
"--context=-1" on the command-line to the 'rcsdiff' program.  Is it possible
that CVSNT's rcsdiff program won't allow negative numbers for the --context
option?

In your ViewVC installation, see the file lib/vclib/ccvs/bincvs.py.  In that
file is a function, raw_diff().  In that function is the following line:

    fp = self.rcs_popen('rcsdiff', args, 'rt')

Add a line just before this one that looks like so:

    raise Exception(' '.join(['rcsdiff'] + args))

and then re-attempt your long colored diff.  ViewVC should raise an
Exception that shows you the command it was about to execute to generated
that diff.  In my test run, for example, I see (among other things):
"Exception: rcsdiff -u -p -kk -r1.1 -r1.36
/usr/local/cvs/ViewCVS/viewcvs/standalone.py,v".  You should be able to then
execute that statement yourself at a command shell and see if CVSNT's
rcsdiff program raises some error that ViewVC is failing to detect.  (And
then maybe you and I can teach ViewVC to detect it!)

-- 
C. Michael Pilato <[email protected]>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

------------------------------------------------------
http://viewvc.tigris.org/ds/viewMessage.do?dsForumId=4255&dsMessageId=2612884

To unsubscribe from this discussion, e-mail: [[email protected]].

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkv6lO8ACgkQokEGqRcG/W7V9wCfXc0SNQ54SP1xObK7V9LTesjr
XGQAoItJD1dnBZw8CHM1rwU/2y0rS814
=h+lA
-----END PGP SIGNATURE-----