die "No 'patches' directory present in the current dir.\n" unless -d 'patches';
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>);
+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;
-
-$incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
-
-system "git-checkout master" and exit 1;
+my $incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
+system "git checkout master" and exit 1;
if ($incl_generated_files) {
- die "'a' already exists.\n" if -e 'a';
- die "'b' already exists.\n" if -e 'b';
- system "./prepare-source && rsync -a @extra_files a/" and exit 1;
+ 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;
}
+my $last_touch = time;
my(@patches, %local_patch);
if (@ARGV) {
s{\.diff$} {};
push(@patches, $_);
}
- open(PIPE, '-|', 'git-branch', '-l') or die $!;
+ open(PIPE, '-|', 'git', 'branch', '-l') or die $!;
} else {
- open(PIPE, '-|', 'git-branch', '-a') or die $!;
+ open(PIPE, '-|', 'git', 'branch', '-a') or die $!;
}
while (<PIPE>) {
if (m# origin/patch/(.*)#) {
}
close PIPE;
+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 %completed;
foreach my $patch (@patches) {
+ next if $completed{$patch}++;
+ update_patch($patch);
+}
+
+if ($incl_generated_files) {
+ system "rm -rf a b";
+}
+
+sleep 1 if $last_touch == time;
+system "git checkout master";
+
+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;
}
- 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";
+ 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|;
+ if (system("git rebase -m $parent") != 0) {
+ print qq|"git rebase -m $parent" incomplete -- please fix.\n|;
$ENV{PS1} = "[$parent] patch/$patch: ";
- system $ENV{SHELL};
+ 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 "make gen && 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 $_;
+ }
+ 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 $!;
while (<PIPE>) {
s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
close OUT;
}
-
-if ($incl_generated_files) {
- system "rm -rf a b";
-}
-
-print "-------- master --------\n";
-system "git-checkout master && ./prepare-source";