X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fp4genpatch;h=ccedff1087e1aa60d612953ecfb51a826ed5a88f;hb=c727eafaa06ca49aa032ce478f9a6e09bd19fda2;hp=5c55d3814b7ff1ae46124a028786da6ef1893fe9;hpb=00082bef1294a85e4fd1c89d6249f3facad617b7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/p4genpatch b/Porting/p4genpatch
index 5c55d38..ccedff1 100644
--- a/Porting/p4genpatch
+++ b/Porting/p4genpatch
@@ -51,9 +51,11 @@ while (<$p4>) {
 close $p4;
 
 my $tempdir;
+my @unlink;
 print "Differences ...\n";
 for my $a (@action) {
   $tempdir ||= tempdir( "tmp-XXXX", CLEANUP => 1, TMPDIR => 1 );
+  @unlink = ();
   my($action,$file,$prefix) = @$a;
   my($path,$basename,$number) = $file =~ m|\Q$prefix\E/(.+/)?([^/]+)#(\d+)|;
 
@@ -69,7 +71,7 @@ for my $a (@action) {
   # can't assume previous rev == $number-1 due to obliterated revisions
   $prevfile = "$depotfile\@$prevchange";
   if ($number == 1 or $action =~ /^(add|branch)$/) {
-    $d1 = File::Spec->devnull;
+    $d1 = $^O eq 'MacOS' ? File::Spec->devnull : "/dev/null";
     $t1 = $d1;
     ++$doadd;
   } elsif ($action =~ /^(edit|integrate)$/) {
@@ -92,11 +94,13 @@ for my $a (@action) {
       $t1 = File::Spec->catfile($tempdir, $d1);
       rename $oldt1, $t1;
     }
+    push @unlink, $t1;
   } else {
     die "Unknown action[$action]";
   }
-  $d2 = "$path$basename";
+  $d2 = File::Spec->catfile($path, $basename);
   $t2 = File::Spec->catfile($tempdir, $d2);
+  push @unlink, $t2;
   warn "==> $d2#$number <==\n" if $OPT{v};
   my $system = qq[p4 @P4opt print -o "$t2" "$file"];
   # warn "system[$system]";
@@ -113,7 +117,11 @@ for my $a (@action) {
     unless ($type =~ /text/) {
       next;
     }
-    print "Index: $path$basename\n";
+    unless ($^O eq 'MacOS') {
+      $d1 =~ s,\\,/,g;
+      $d2 =~ s,\\,/,g;
+    }
+    print "Index: $d2\n";
     correctmtime($prevfile,$prev,$t1) unless $doadd;
     correctmtime($file,$number,$t2);
     chdir $tempdir or warn "Could not chdir '$tempdir': $!";
@@ -121,7 +129,9 @@ for my $a (@action) {
     system($system); # no return check because diff doesn't always return 0
     chdir $TOPDIR or warn "Could not chdir '$TOPDIR': $!";
   }
-  for ($t1, $t2) {
+}
+continue {
+  for (@unlink) {
     unlink or warn "Could not unlink $_: $!" if -f;
   }
 }