Make sure we process a parent patch before a dependent patch.

[rsync/rsync.git] / support / patch-update

diff --git a/support/patch-update b/support/patch-update
index 2fba7b3..c428982 100755 (executable)
--- a/support/patch-update
+++ b/support/patch-update
@@ -15,18 +15,15 @@ $_ = join('', <IN>);
 close IN;
 
 my @extra_files = m{\n([^\s:]+):.*\n\t\S}g;
-my $incl_generated_files;
-
-$incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
+my $incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
 
 system "git-checkout master" and exit 1;
-my $last_touch = time;
-
 if ($incl_generated_files) {
     die "'a' must not exist in the current directory.\n" if -e 'a';
     die "'b' must not exist in the current directory.\n" if -e 'b';
     system "./prepare-source && rsync -a @extra_files a/" and exit 1;
 }
+my $last_touch = time;
 
 my(@patches, %local_patch);
 if (@ARGV) {
@@ -48,28 +45,67 @@ while (<PIPE>) {
 }
 close PIPE;
 
+my(%parent, %description);
+foreach my $patch (@patches) {
+    my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
+    open(PIPE, '-|', 'git-diff', "master...$branch", '--', "PATCH.$patch") or die $!;
+    while (<PIPE>) {
+       last if /^@@ /;
+    }
+    my $desc = '';
+    while (<PIPE>) {
+       next if /^-/; # huh??
+       s/^.//;
+       if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
+           $parent{$patch} = $1;
+       }
+       $desc .= $_;
+    }
+    $description{$patch} = $desc;
+}
+
+my %completed;
 foreach my $patch (@patches) {
+    next if $completed{$patch}++;
+    update_patch($patch);
+}
+
+if ($incl_generated_files) {
+    system "rm -rf a b";
+}
+
+print "-------- master --------\n";
+sleep 1 if $last_touch == time;
+system "git-checkout master && ./prepare-source";
+
+exit;
+
+
+sub update_patch
+{
+    my($patch) = @_;
+
+    my $parent = $parent{$patch};
+    if (defined $parent) {
+       unless ($completed{$parent}++) {
+           update_patch($parent);
+       }
+       $parent = "patch/$parent";
+    } else {
+       $parent = 'master';
+    }
+
     print "======== $patch ========\n";
+
     sleep 1 if $incl_generated_files && $last_touch == time;
     if ($local_patch{$patch}) {
        system "git-checkout patch/$patch" and exit 1;
     } else {
        system "git-checkout --track -b patch/$patch origin/patch/$patch" and exit 1;
     }
-    $last_touch = time;
 
-    my $parent = 'master';
-    open(IN, '<', 'PATCH') or next;
     open(OUT, '>', "patches/$patch.diff") or die $!;
-
-    while (<IN>) {
-       if (m#patch -p1 <patch/(\S+)\.diff# && $1 ne $patch) {
-           $parent = $1;
-       }
-       print OUT $_;
-    }
-    close IN;
-    print OUT "\n";
+    print OUT $description{$patch}, "\n";
 
     if (system("git-rebase -m $parent") != 0) {
        print qq|"git-rebase -m $parent" incomplete -- please fix.\n|;
@@ -77,19 +113,24 @@ foreach my $patch (@patches) {
        system $ENV{SHELL} and exit 1;
     }
 
-    open(PIPE, '-|', 'git-diff', 'master') or die $!;
-    while (<PIPE>) {
-       last if m{^diff --git a/PATCH b/PATCH$};
-       print OUT $_;
+    if ($incl_generated_files) {
+       system "./prepare-source && rsync -a @extra_files b/" and exit 1;
     }
-    while (<PIPE>) {
-       last if m{^diff --git a/};
+    $last_touch = time;
+
+    open(PIPE, '-|', 'git-diff', $parent) or die $!;
+    DIFF: while (<PIPE>) {
+       while (m{^diff --git a/PATCH}) {
+           while (<PIPE>) {
+               last if m{^diff --git a/};
+           }
+           last DIFF if !defined $_;
+       }
+       print OUT $_;
     }
-    print OUT $_, <PIPE>;
     close PIPE;
 
     if ($incl_generated_files) {
-       system "./prepare-source && rsync -a @extra_files b/" and exit 1;
        open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
        while (<PIPE>) {
            s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
@@ -100,11 +141,3 @@ foreach my $patch (@patches) {
 
     close OUT;
 }
-
-if ($incl_generated_files) {
-    system "rm -rf a b";
-}
-
-print "-------- master --------\n";
-sleep 1 if $last_touch == time;
-system "git-checkout master && ./prepare-source";