Thread: [Codestriker-user] display of entire file contents with diffs highlighted
Brought to you by:
sits
From: Rob R. <c_...@ky...> - 2004-08-27 17:43:27
|
In Section 3.5.3 (Viewing Complete old/new Files) of the Codestriker = Guide (accessed on the web as = http://codestriker.sourceforge.net/x458.html#VIEW-FILE), the following = sentence appears: "The review has to be linked to a SCM repository, so that it can fetch = parts of the file which aren't a part of the review text." This seems to mean that, in order to show side-by-side the entire = contents of a file's "original" and "changed" versions (with differences = highlighted), one must provide some kind of "link" to the source control = system through which Codestriker can obtain the non-changed lines. It = already has the changed lines, as they came to Codestriker in the diff = output. I do not understand what it actually means to provide this "link to a = SCM repository". In our current setup, Codestriker shows the window as = if the entire file contents were available (that is, all the line = numbers are present and all the lines from the diff are present), *but* = the rest of the lines (those which were not different, so were not in = the diff output) are empty. The line numbers appear, but not the lines = themselves. I imagine this is because Codestriker does not have the = needed "link to a SCM repository", and so it just leaves the lines in = its display empty. What, *exactly*, is the method by which we make the "review linked to a = SCM repository"? Our SCM system is Perforce (and we've gotten most of = that integration to work just fine). Please forgive my probably-foolish question, and thank you very much for = your time and help. -------------------------------------------------------------------------= ------- Don't talk to me about naval tradition. It's nothing but rum, sodomy and = the lash. Sir Winston Churchill |
From: David S. <si...@us...> - 2004-08-29 23:38:44
|
Hi Rob, > the diff output) are empty. The line numbers appear, but not the lines > themselves. I imagine this is because Codestriker does not have the > needed "link to a SCM repository", and so it just leaves the lines in > its display empty. This means something has gone wrong when Codestriker has tried to fetch the actual code from the Perforce repository. Check your apache error log file, there should be a message in there which will hopefully indicate what the problem is. Ideally, this text should appear in the browser window, I'll look into fixing that. You need to make sure the user running the web server process (eg nobody or apache) has permissions to access the perforce repository. If you define the repository in @valid_repositories within codestriker.conf 'perforce:sits:sits2@localhost:1666' when you click on a "Line XXX" or "Parallel" link, say for filename "zot.c" revision 4, this will execute the command: p4 -H localhost -p 1666 -u sits -c sits2 print -q zot.c#4 The stdout from this command is then picked up by Codestriker, and used to form the complete view. Try executing this command as the webserver user to see if it works or not. -- Cheers, David |
From: David S. <si...@us...> - 2004-08-30 00:30:34
|
> Try executing this command as the webserver user to see if it works or > not. Obviously with your own settings! -- Cheers, David |