From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Sat, 4 May 2002 16:09:15 +0000 (+0000)
Subject: Allow p4genpatch to use diff programs other than 'diff'.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2d6becbd00a9616dac5f0b98ae18d42642941cca;p=p5sagit%2Fp5-mst-13.2.git

Allow p4genpatch to use diff programs other than 'diff'.

p4raw-id: //depot/perl@16394
---

diff --git a/Porting/p4genpatch b/Porting/p4genpatch
index 04cec04..9e4cbf5 100644
--- a/Porting/p4genpatch
+++ b/Porting/p4genpatch
@@ -18,10 +18,10 @@ sub Usage ();
 my $VERSION = '0.03';
 $0 =~ s|^.*/||;
 our(%OPT, @P4opt);
-%OPT = ( "d" => "u", b => "//depot/perl/" );
+%OPT = ( "d" => "u", b => "//depot/perl/", "D" => "diff" );
 use Getopt::Long;
 Getopt::Long::Configure("no_ignore_case");
-GetOptions(\%OPT, "b=s", "p=s", "d=s", "h", "v", "V") or die Usage;
+GetOptions(\%OPT, "b=s", "p=s", "d=s", "D=s", "h", "v", "V") or die Usage;
 print Usage and exit if $OPT{h};
 print "$VERSION\n" and exit if $OPT{V};
 die Usage unless @ARGV == 1;
@@ -90,7 +90,7 @@ for my $a (@action) {
     my @filelog = `p4 @P4opt filelog $file`;
     correctmtime(\@filelog,$prev,"$tempdir/$d1");
     correctmtime(\@filelog,$number,"$tempdir/$d2");
-    $system = "cd $tempdir && diff -$OPT{d} '$d1' '$d2'";
+    $system = "cd $tempdir && $OPT{D} -$OPT{d} '$d1' '$d2'";
     system($system); # no return check because diff doesn't always return 0
   }
   for ("$tempdir/$d1","$tempdir/$d2") {
@@ -127,6 +127,7 @@ sub Usage () {
 
           -p host:port       p4 port (e.g. myhost:1666)
           -d diffopt         option to pass to diff(1)
+          -D diff            diff(1) to use
 	  -b branch(es)      which branches to include (regex)
 		             (default: //depot/perl/)
           -v                 verbose