use strict;
-die "No 'patches' directory present in the current dir.\n" unless -d 'patches';
+my $patches_dir = 'patches';
+my $incl_generated_files;
+
+if (@ARGV && $ARGV[0] =~ /^--gen(?:=(\S+))?$/) {
+ $patches_dir = $1 if defined $1;
+ $incl_generated_files = 1;
+ shift;
+}
+
+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>);
+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 = shift if @ARGV && $ARGV[0] eq '--gen';
-
-system "git-checkout master" and exit 1;
+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 "./prepare-source && rsync -a @extra_files a/" and exit 1;
+ system "./config.status Makefile && make gen && rsync -a @extra_files a/" and exit 1;
}
my $last_touch = time;
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/(.*)#) {
my(%parent, %description);
foreach my $patch (@patches) {
my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
- open(PIPE, '-|', 'git-diff', "master...$branch", '--', "PATCH.$patch") or die $!;
+ my $desc = '';
+ open(PIPE, '-|', 'git', 'diff', '-U1000', "master...$branch", '--', "PATCH.$patch") or die $!;
while (<PIPE>) {
last if /^@@ /;
}
- my $desc = '';
while (<PIPE>) {
- next if /^-/; # huh??
- s/^.//;
+ next unless s/^[ +]//;
if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
$parent{$patch} = $1;
}
system "rm -rf a b";
}
-print "-------- master --------\n";
sleep 1 if $last_touch == time;
-system "git-checkout master && ./prepare-source";
+system "git checkout master";
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 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;
}
- open(OUT, '>', "patches/$patch.diff") or die $!;
+ open(OUT, '>', "$patches_dir/$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} and exit 1;
}
if ($incl_generated_files) {
- system "./prepare-source && rsync -a @extra_files b/" and exit 1;
+ system "./config.status Makefile && make gen && rsync -a @extra_files b/" and exit 1;
}
$last_touch = time;
- open(PIPE, '-|', 'git-diff', $parent) or die $!;
+ open(PIPE, '-|', 'git', 'diff', $parent) or die $!;
DIFF: while (<PIPE>) {
while (m{^diff --git a/PATCH}) {
while (<PIPE>) {
}
last DIFF if !defined $_;
}
+ next if /^index /;
print OUT $_;
}
close PIPE;