[p4] problems about python review daemon.

Weintraub, David david.weintraub at bofasecurities.com
Tue Aug 8 06:08:29 PDT 2006


If you're using "p4 diff", you could set the environment variable
"P4DIFF" to the diff program you want to use. You then create a one line
shell script that looks like this:

    /usr/local/bin/diff --side-by-side $1 $2

Then set P4DIFF to be this shell script.

-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Sweeney, Tony
Sent: Tuesday, August 08, 2006 4:38 AM
To: Zarnes, Todd; perforce-user at perforce.com
Subject: Re: [p4] problems about python review daemon.

Todd,
	I don't believe Perforce calls the native diff(1) implementation
-- both client (diff) and server (diff2) implement the diff
functionality internally, so that the functionality is the same across
platforms, and GNU extensions such as --side-by-side aren't available.
This is corroborated by the following output from 'p4 help describe':

        The -d<flag> passes a flag to the built-in diff routine to
modify
        the output: -dn (RCS), -dc (context), -ds (summary), -du
(unified),
        -db (ignore whitespace changes), -dw (ignore whitespace).

The help for diff and diff2 contains similar references to the built-in
diff routine.

Tony.

quis custodiet ipsos custodes -- Juvenal VI, 347-8  

> -----Original Message-----
> From: Zarnes, Todd [mailto:Todd_Zarnes at intuit.com]
> Sent: 07 August 2006 22:05
> To: Sweeney, Tony; perforce-user at perforce.com
> Subject: RE: [p4] problems about python review daemon.
> 
> Anybody get fancier with the diff output in the email from the review 
> daemon?  I was trying to explore ' --side-by-side ' to change the diff

> display to dif columns but could not get a display.
> 
> Todd
> 
> -----Original Message-----
> From: perforce-user-bounces at perforce.com
> [mailto:perforce-user-bounces at perforce.com]
> Sent: Friday, August 04, 2006 3:37 AM
> To: Yan Tong; perforce-user at perforce.com
> Subject: Re: [p4] problems about python review daemon.
> 
> On line 318 of the script, change the call to op.popen so that the 
> instead of ' describe -s ' it has ' describe -du '.
> This will send a unified diff instead of just the file listing.
> 
> Tony.
> 
> quis custodiet ipsos custodes -- Juvenal VI, 347-8
> 
> > -----Original Message-----
> > From: perforce-user-bounces at perforce.com
> > [mailto:perforce-user-bounces at perforce.com] On Behalf Of Yan Tong
> > Sent: 04 August 2006 09:55
> > To: perforce-user at perforce.com
> > Subject: [p4] problems about python review daemon.
> > 
> > I use the python review daemon now and it seems work well.
> > Now I want to know if  it is possible to get an unified
> diff for the
> > changes made to be included in the commit mail.
> > Anyone know about this?
> > _______________________________________________
> > perforce-user mailing list  -  perforce-user at perforce.com 
> > http://maillist.perforce.com/mailman/listinfo/perforce-user
> > 
> 
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com 
> http://maillist.perforce.com/mailman/listinfo/perforce-user
> 

_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user


More information about the perforce-user mailing list