Changed the commands used to "make gen" without any stoppage.

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

diff --git a/packaging/patch-update b/packaging/patch-update
index f697cd6..15d1b6c 100755 (executable)
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -10,6 +10,7 @@ use Getopt::Long;
 
 my $patches_dir = 'patches';
 my $tmp_dir = "patches.$$";
+my $make_gen_cmd = 'make -f prepare-source.mak conf && ./config.status && make gen';
 
 &Getopt::Long::Configure('bundling');
 &usage if !&GetOptions(
@@ -50,19 +51,17 @@ close IN;
 if ($incl_generated_files) {
     die "'$tmp_dir' must not exist in the current directory.\n" if -e $tmp_dir;
     mkdir($tmp_dir, 0700) or die "Unable to mkdir($tmp_dir): $!\n";
-    system "./config.status Makefile && make gen && rsync -a @extra_files $tmp_dir/master/" and exit 1;
+    system "$make_gen_cmd && rsync -a @extra_files $tmp_dir/master/" and exit 1;
 }
 our $last_touch = time;
 
-my(%patches, %local_patch);
+my %patches;
 
 # Start by finding all patches so that we can load all possible parents.
-open(PIPE, '-|', 'git', 'branch', '-a') or die $!;
+open(PIPE, '-|', 'git', 'branch', '-l') or die $!;
 while (<PIPE>) {
-    if (m# origin/patch/(.*)#) {
+    if (m# patch/(.*)#) {
        $patches{$1} = 1;
-    } elsif (m# patch/(.*)#) {
-       $patches{$1} = $local_patch{$1} = 1;
     }
 }
 close PIPE;
@@ -71,7 +70,7 @@ my @patches = sort keys %patches;
 
 my(%parent, %description);
 foreach my $patch (@patches) {
-    my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
+    my $branch = "patch/$patch";
     my $desc = '';
     open(PIPE, '-|', 'git', 'diff', '-U1000', "$master_branch...$branch", '--', "PATCH.$patch") or die $!;
     while (<PIPE>) {
@@ -80,10 +79,14 @@ foreach my $patch (@patches) {
     while (<PIPE>) {
        next unless s/^[ +]//;
        if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
-           $parent{$patch} = $1;
+           my $parent = $parent{$patch} = $1;
+           if (!$patches{$parent}) {
+               die "Parent of $patch is not a local branch: $parent\n";
+           }
        }
        $desc .= $_;
     }
+    close PIPE;
     $description{$patch} = $desc;
 }
 
@@ -91,8 +94,11 @@ if (@ARGV) {
     # Limit the list of patches to actually process based on @ARGV.
     @patches = ( );
     foreach (@ARGV) {
-       s{^(patches|patch|origin/patch)/} {};
+       s{^patch(es)?/} {};
        s{\.diff$} {};
+       if (!$patches{$_}) {
+           die "Local branch not available for patch: $_\n";
+       }
        push(@patches, $_);
     }
 }
@@ -130,11 +136,7 @@ sub update_patch
     print "======== $patch ========\n";
 
     sleep 1 while $incl_generated_files && $last_touch >= time;
-    if ($local_patch{$patch}) {
-       system "git checkout patch/$patch" and return 0;
-    } else {
-       system "git checkout --track -b patch/$patch origin/patch/$patch" and return 0;
-    }
+    system "git checkout patch/$patch" and return 0;
 
     my $ok = system("git merge $parent") == 0;
     if (!$ok || $launch_shell) {
@@ -157,7 +159,7 @@ sub update_patch
     print OUT $description{$patch}, "\n";
 
     if ($incl_generated_files) {
-       system "./config.status Makefile && make gen && rsync -a @extra_files $tmp_dir/$patch/" and exit 1;
+       system "$make_gen_cmd && rsync -a @extra_files $tmp_dir/$patch/" and exit 1;
     }
     $last_touch = time;