Christian,

OK - so my first impression seems to be spot on - you do need GNU diff
in my case.

I did review the rbtools code and was wondering what magic was there
as I only saw a reference to the diff and gdiff commands for the
PerforceClient class.

Thanks again,

 - Ron



On May 21, 4:21 pm, Christian Hammond <chip...@chipx86.com> wrote:
> We don't support p4 diff because it doesn't generate the information we
> need.
>
> In order for Review Board to download the files from the repository to
> generate its side-by-side diff, it must know the exact revisions of these
> files. Diffs generated by p4 diff don't include this information (maybe it
> does in newer ones? Certainly not older versions). They also historically
> have had issues generating diffs with proper add/delete information on some
> versions of Perforce.
>
> So, p4 diff is basically not something we can rely on. By generating the
> diff ourselves, we can guarantee it's in a format with information that
> Review Board can use. We require GNU diff in order to generate our own diff,
> so you will definitely need that.
>
> Christian
>
> --
> Christian Hammond - chip...@chipx86.com
> Review Board -http://www.reviewboard.org
> VMware, Inc. -http://www.vmware.com
>
>
>
>
>
> On Fri, May 21, 2010 at 12:46 PM, rifferte <riffe...@gmail.com> wrote:
> > Wow - thank you so much Dana for clearing that up for me.
>
> > I do have one follow up question:
>
> > What do I have to do to have RBTools use "p4 diff" instead of "diff"?
>
> > I have both commands on my path, but it seems to utilize diff first.
> > In all honesty I installed GNU DiffUtils because I didn't think I
> > could use the P4 Diff command at all.
>
> > I do have the P4 Custom Tool integration working. It is wonderful :)
>
> > On May 21, 3:24 pm, "Dana Lacoste" <dlaco...@aperio.com> wrote:
> > > This one's actually fairly easy to understand.
>
> > > The problem isn't with the GUI tools (P4Merge, which lets you merge
> > > changes
> > > when integrating) and P4Diff (which simply displays diffs between
> > > Perforce
> > > file versions).
>
> > > RB doesn't use the GUI tools, it uses the command line tools.
>
> > > The area we're concerned with here is that there's more or less a
> > > "standard"
> > > way to say "show me what changes have been made to this file" and that
> > > is the
> > > command line "diff" utility.  You can do "svn diff <file>" or "cvs diff
> > > <file>"
> > > or "p4 diff <file>" and it will show you what has changed in that file,
> > > so you
> > > can decide if you want to submit the changes or not.
>
> > > The problem is that the output of the "p4 diff <file>" command is
> > > different
> > > from the output of the "cvs diff <file>" command (and all of the other
> > > tools
> > > which produce a format similar to the "GNU diffutils" formatting.)
>
> > > So RB has to re-format this "diff" output so that it can be handled
> > > properly.
>
> > > The RBTools package provides the "post-review" tool which does this
> > > work.
>
> > > Does that make sense?
>
> > > You can still use P4Merge and P4Diff, etc, you just can't take the
> > > output
> > > from those tools and directly upload them to RB, and post-review is the
> > > tool
> > > that makes that happen.
>
> > > Note that you can add a "custom tool" in P4V so that you can simply
> > > right-click
> > > on a changelist and upload it to RB directly (basically, you tell it to
> > > call
> > > post-review and it uploads the files as described above) and then you're
> > > entirely
> > > in GUI-land and don't even need to load a command line (though you still
> > > do need
> > > to have RBTools installed.)
>
> > > Dana Lacoste
>
> > > -----Original Message-----
> > > From: reviewboard@googlegroups.com [mailto:reviewbo...@googlegroups.com]
>
> > > On Behalf Of rifferte
> > > Sent: Friday, May 21, 2010 6:15 AM
> > > To: reviewboard
> > > Subject: Question on Perforce & Diffs
>
> > > Can someone explain the following lines from the documentation:
>
> > > "If you use Perforce, though, you'll need to use post-review  instead
> > > of the web UI. Note that this means you can't just use a standard diff
> > > generated by the diff tool. You'll need to consult your version
> > > control system's documentation for information on generating diffs."
>
> > > "post-review must be used if you're using Perforce with Review Board,
> > > as the diff generated by p4 diff doesn't provide the information
> > > necessary to properly display a side-by-side diff."
>
> > > I am interpreting this to mean that I cannot use Perforce's built in
> > > diff tool (P4Merge). But, you could interpret this as meaning you can
> > > use P4Diff with post-review. I am currently up and running using
> > > Perforce + GNU DiffUtil which is working fine, but I just wanted some
> > > clarity on this point (it would save having to install another 3rd
> > > party tool).
>
> > > What is it exactly about Perforce that limits the use of the WebUI?
>
> > > Thanks,
>
> > >  - Ron
>
> > > --
> > > Want to help the Review Board project? Donate today athttp://
> >www.reviewboard.org/donate/
> > > Happy user? Let us know athttp://www.reviewboard.org/users/
> > > -~----------~----~----~----~------~----~------~--~---
> > > To unsubscribe from this group, send email to
> > > reviewboard+unsubscr...@googlegroups.com<reviewboard%2bunsubscr...@googlegr
> > >  oups.com>
> > > For more options, visit this group athttp://
> > groups.google.com/group/reviewboard?hl=en
>
> > > --
> > > Want to help the Review Board project? Donate today athttp://
> >www.reviewboard.org/donate/
> > > Happy user? Let us know athttp://www.reviewboard.org/users/
> > > -~----------~----~----~----~------~----~------~--~---
> > > To unsubscribe from this group, send email to
> > reviewboard+unsubscr...@googlegroups.com<reviewboard%2bunsubscr...@googlegr 
> > oups.com>
> > > For more options, visit this group athttp://
> > groups.google.com/group/reviewboard?hl=en
>
> > --
> > Want to help the Review Board project? Donate today at
> >http://www.reviewboard.org/donate/
> > Happy user? Let us know athttp://www.reviewboard.org/users/
> > -~----------~----~----~----~------~----~------~--~---
> > To unsubscribe from this group, send email to
> > reviewboard+unsubscr...@googlegroups.com<reviewboard%2bunsubscr...@googlegr 
> > oups.com>
> > For more options, visit this group at
> >http://groups.google.com/group/reviewboard?hl=en
>
> --
> Want to help the Review Board project? Donate today 
> athttp://www.reviewboard.org/donate/
> Happy user? Let us know athttp://www.reviewboard.org/users/
> -~----------~----~----~----~------~----~------~--~---
> To unsubscribe from this group, send email to 
> reviewboard+unsubscr...@googlegroups.com
> For more options, visit this group 
> athttp://groups.google.com/group/reviewboard?hl=en

-- 
Want to help the Review Board project? Donate today at 
http://www.reviewboard.org/donate/
Happy user? Let us know at http://www.reviewboard.org/users/
-~----------~----~----~----~------~----~------~--~---
To unsubscribe from this group, send email to 
reviewboard+unsubscr...@googlegroups.com
For more options, visit this group at 
http://groups.google.com/group/reviewboard?hl=en

Reply via email to