# 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 ),
+ 'shell|s' => \( my $launch_shell ),
+ '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';
+my($status, $is_clean, $starting_branch) = &check_git_status;
+if (!$skip_branch_check && !$is_clean) {
+ die "The checkout is not clean:\n", $status;
+}
+
my @extra_files;
open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
while (<IN>) {
}
close IN;
-my $incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
-
-system "git checkout master" and exit 1;
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 "make gen && rsync -a @extra_files a/" and exit 1;
+ 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;
-my(@patches, %local_patch);
-if (@ARGV) {
- 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 $!;
-}
+my(%patches, %local_patch);
+
+# 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/(.*)#) {
- push(@patches, $1);
+ $patches{$1} = 1;
} elsif (m# patch/(.*)#) {
- $local_patch{$1} = 1;
+ $patches{$1} = $local_patch{$1} = 1;
}
}
close PIPE;
+my @patches = sort keys %patches;
+
my(%parent, %description);
foreach my $patch (@patches) {
my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
$description{$patch} = $desc;
}
+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, $_);
+ }
+}
+
my %completed;
foreach my $patch (@patches) {
next if $completed{$patch}++;
- update_patch($patch);
+ last unless update_patch($patch);
}
if ($incl_generated_files) {
- system "rm -rf a b";
+ system "rm -rf $tmp_dir";
}
sleep 1 if $last_touch == time;
-system "git checkout master";
+system "git checkout $starting_branch" and exit 1;
exit;
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 return 0;
} 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 return 0;
}
- open(OUT, '>', "patches/$patch.diff") or die $!;
- print OUT $description{$patch}, "\n";
-
- if (system("git rebase -m $parent") != 0) {
- print qq|"git rebase -m $parent" incomplete -- please fix.\n|;
+ my $ok = system("git merge $parent") == 0;
+ if (!$ok || $launch_shell) {
+ print qq|"git merge $parent" incomplete -- please fix.\n| if !$ok;
$ENV{PS1} = "[$parent] patch/$patch: ";
- system $ENV{SHELL} and exit 1;
+ while (1) {
+ if (system($ENV{SHELL}) != 0) {
+ print "Abort? [n/y] ";
+ $_ = <STDIN>;
+ next unless /^y/i;
+ return 0;
+ }
+ ($status, $is_clean) = &check_git_status;
+ last if $is_clean;
+ print $status;
+ }
}
+ open(OUT, '>', "$patches_dir/$patch.diff") or die $!;
+ print OUT $description{$patch}, "\n";
+
if ($incl_generated_files) {
- system "make gen && rsync -a @extra_files b/" and exit 1;
+ system "./config.status Makefile && make gen && rsync -a @extra_files $tmp_dir/$patch/";
}
$last_touch = time;
close PIPE;
if ($incl_generated_files) {
- 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;
}
close OUT;
+
+ 1;
+}
+
+exit;
+
+sub check_git_status
+{
+ open(IN, '-|', 'git status') or die $!;
+ my $status = join('', <IN>);
+ close IN;
+ my $is_clean = $status =~ /\nnothing to commit \(working directory clean\)/;
+ my($starting_branch) = $status =~ /^# On branch (.+)\n/;
+ ($status, $is_clean, $starting_branch);
+}
+
+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
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff