X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/56fc9f70d385b20d431d9fa62ef4fd3941949717..e4c598c830234fe3def0bae6ba45ca54071a9ee5:/packaging/patch-update

diff --git a/packaging/patch-update b/packaging/patch-update
index 46d9ff8f..135b7e48 100755
--- a/packaging/patch-update
+++ b/packaging/patch-update
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 # This script is used to turn one or more of the "patch/*" branches
 # into one or more diffs in the "patches" directory.  Pass the option
 # --gen if you want generated files in the diffs.  Pass the name of
@@ -6,10 +6,12 @@
 # diffs.
 
 use strict;
+use warnings;
 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(
@@ -34,6 +36,17 @@ if (!$skip_branch_check && !$is_clean) {
     die "The checkout is not clean:\n", $status;
 }
 
+my $master_commit;
+open PIPE, '-|', "git log -1 --no-color $master_branch" or die $!;
+while (<PIPE>) {
+    if (/^commit (\S+)/) {
+	$master_commit = $1;
+	last;
+    }
+}
+close PIPE;
+die "Unable to determine commit hash for master branch: $master_branch\n" unless defined $master_commit;
+
 my @extra_files;
 open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
 while (<IN>) {
@@ -50,7 +63,7 @@ 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;
 
@@ -123,13 +136,15 @@ sub update_patch
     my($patch) = @_;
 
     my $parent = $parent{$patch};
+    my $based_on;
     if (defined $parent) {
 	unless ($completed{$parent}++) {
 	    update_patch($parent);
 	}
-	$parent = "patch/$parent";
+	$based_on = $parent = "patch/$parent";
     } else {
 	$parent = $master_branch;
+	$based_on = $master_commit;
     }
 
     print "======== $patch ========\n";
@@ -137,9 +152,9 @@ sub update_patch
     sleep 1 while $incl_generated_files && $last_touch >= time;
     system "git checkout patch/$patch" and return 0;
 
-    my $ok = system("git merge $parent") == 0;
+    my $ok = system("git merge $based_on") == 0;
     if (!$ok || $launch_shell) {
-	print qq|"git merge $parent" incomplete -- please fix.\n| if !$ok;
+	print qq|"git merge $based_on" incomplete -- please fix.\n| if !$ok;
 	$ENV{PS1} = "[$parent] patch/$patch: ";
 	while (1) {
 	    if (system($ENV{SHELL}) != 0) {
@@ -155,14 +170,14 @@ sub update_patch
     }
 
     open(OUT, '>', "$patches_dir/$patch.diff") or die $!;
-    print OUT $description{$patch}, "\n";
+    print OUT $description{$patch}, "\nbased-on: $based_on\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;
 
-    open(PIPE, '-|', 'git', 'diff', $parent) or die $!;
+    open(PIPE, '-|', 'git', 'diff', $based_on) or die $!;
     DIFF: while (<PIPE>) {
 	while (m{^diff --git a/PATCH}) {
 	    while (<PIPE>) {
@@ -212,9 +227,15 @@ sub check_git_status
 sub usage
 {
     die <<EOT;
-Usage: patch-update [OPTIONS]
-
---gen[=DIR]   Include generated files.  Optional dest DIR overrides "patches".
---skip-check  Skip the check that ensures starting with a clean branch.
+Usage: patch-update [OPTIONS] [patches/DIFF...]
+
+Options:
+-b, --branch=BRANCH  The master branch to merge into the patch/* branches.
+    --gen[=DIR]      Include generated files.  Optional destination DIR
+                     arg overrides the default of using the "patches" dir.
+    --skip-check     Skip the check that ensures starting with a clean branch.
+-s, --shell          Launch a shell for every patch/* branch updated, not
+                     just when a conflict occurs.
+-h, --help           Output this help message.
 EOT
 }