X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/18fa91296bb0e85130f8e98e710528a18a20028f..a5e0bf35795dde0e5f9b509ba09d9e28dbfb530b:/support/patch-update

diff --git a/support/patch-update b/support/patch-update
index 2fba7b30..f6eb47fe 100755
--- a/support/patch-update
+++ b/support/patch-update
@@ -6,93 +6,171 @@
 # diffs.
 
 use strict;
+use Getopt::Long;
+
+my $patches_dir = 'patches';
+my $tmp_dir = "patches.$$";
+
+&Getopt::Long::Configure('bundling');
+&usage if !&GetOptions(
+    'skip-check' => \( my $skip_branch_check ),
+    'gen:s' => \( my $incl_generated_files ),
+    'help|h' => \( my $help_opt ),
+);
+&usage if $help_opt;
+
+if (defined $incl_generated_files) {
+    $patches_dir = $incl_generated_files if $incl_generated_files ne '';
+    $incl_generated_files = 1;
+}
 
-die "No 'patches' directory present in the current dir.\n" unless -d 'patches';
+die "No '$patches_dir' directory was found.\n" unless -d $patches_dir;
 die "No '.git' directory present in the current dir.\n" unless -d '.git';
 
-open(IN, '<', 'prepare-source.mak') or die "Couldn't open prepare-source.mak: $!\n";
-$_ = join('', <IN>);
+open(IN, '-|', 'git status') or die $!;
+my $status = join('', <IN>);
+close IN;
+unless ($skip_branch_check) {
+    die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit \(working directory clean\)/;
+}
+my($starting_branch) = $status =~ /^# On branch (.+)\n/;
+
+my @extra_files;
+open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
+while (<IN>) {
+    if (s/^GENFILES=//) {
+	while (s/\\$//) {
+	    $_ .= <IN>;
+	}
+	@extra_files = split(' ', $_);
+	last;
+    }
+}
 close IN;
 
-my @extra_files = m{\n([^\s:]+):.*\n\t\S}g;
-my $incl_generated_files;
+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;
+}
+my $last_touch = time;
 
-$incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
+my(%patches, %local_patch);
 
-system "git-checkout master" and exit 1;
-my $last_touch = time;
+# Start by finding all patches so that we can load all possible parents.
+open(PIPE, '-|', 'git', 'branch', '-a') or die $!;
+while (<PIPE>) {
+    if (m# origin/patch/(.*)#) {
+	$patches{$1} = 1;
+    } elsif (m# patch/(.*)#) {
+	$patches{$1} = $local_patch{$1} = 1;
+    }
+}
+close PIPE;
 
-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 @patches = sort keys %patches;
+
+my(%parent, %description);
+foreach my $patch (@patches) {
+    my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
+    my $desc = '';
+    open(PIPE, '-|', 'git', 'diff', '-U1000', "master...$branch", '--', "PATCH.$patch") or die $!;
+    while (<PIPE>) {
+	last if /^@@ /;
+    }
+    while (<PIPE>) {
+	next unless s/^[ +]//;
+	if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
+	    $parent{$patch} = $1;
+	}
+	$desc .= $_;
+    }
+    $description{$patch} = $desc;
 }
 
-my(@patches, %local_patch);
 if (@ARGV) {
+    # Limit the list of patches to actually process based on @ARGV.
+    @patches = ( );
     foreach (@ARGV) {
 	s{^(patches|patch|origin/patch)/} {};
 	s{\.diff$} {};
 	push(@patches, $_);
     }
-    open(PIPE, '-|', 'git-branch', '-l') or die $!;
-} else {
-    open(PIPE, '-|', 'git-branch', '-a') or die $!;
 }
-while (<PIPE>) {
-    if (m# origin/patch/(.*)#) {
-	push(@patches, $1);
-    } elsif (m# patch/(.*)#) {
-	$local_patch{$1} = 1;
-    }
-}
-close PIPE;
 
+my %completed;
 foreach my $patch (@patches) {
+    next if $completed{$patch}++;
+    update_patch($patch);
+}
+
+if ($incl_generated_files) {
+    system "rm -rf $tmp_dir";
+}
+
+sleep 1 if $last_touch == time;
+system "git checkout $starting_branch" and exit 1;
+
+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;
+	system "git checkout patch/$patch" and exit 1;
     } else {
-	system "git-checkout --track -b patch/$patch origin/patch/$patch" and exit 1;
+	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 $!;
+    open(OUT, '>', "$patches_dir/$patch.diff") or die $!;
+    print OUT $description{$patch}, "\n";
 
-    while (<IN>) {
-	if (m#patch -p1 <patch/(\S+)\.diff# && $1 ne $patch) {
-	    $parent = $1;
-	}
-	print OUT $_;
-    }
-    close IN;
-    print OUT "\n";
-
-    if (system("git-rebase -m $parent") != 0) {
-	print qq|"git-rebase -m $parent" incomplete -- please fix.\n|;
+    if (system("git merge $parent") != 0) {
+	print qq|"git merge $parent" incomplete -- please fix.\n|;
 	$ENV{PS1} = "[$parent] patch/$patch: ";
 	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 "./config.status Makefile && make gen && rsync -a @extra_files $tmp_dir/$patch/" 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 $_;
+	}
+	next if /^index /;
+	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 $!;
+	$parent =~ s#.*/##;
+	open(PIPE, '-|', 'diff', '-up', "$tmp_dir/$parent", "$tmp_dir/$patch") or die $!;
 	while (<PIPE>) {
-	    s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
+	    s#^(diff -up) $tmp_dir/[^/]+/(.*?) $tmp_dir/[^/]+/(.*)#$1 a/$2 b/$3#o;
+	    s#^\Q---\E $tmp_dir/[^/]+/([^\t]+)\t.*#--- a/$1#o;
+	    s#^\Q+++\E $tmp_dir/[^/]+/([^\t]+)\t.*#+++ b/$1#o;
 	    print OUT $_;
 	}
 	close PIPE;
@@ -101,10 +179,14 @@ foreach my $patch (@patches) {
     close OUT;
 }
 
-if ($incl_generated_files) {
-    system "rm -rf a b";
-}
+exit;
 
-print "-------- master --------\n";
-sleep 1 if $last_touch == time;
-system "git-checkout master && ./prepare-source";
+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.
+EOT
+}