mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-01-21 13:28:25 -05:00
112 lines
2.9 KiB
Perl
Executable File
112 lines
2.9 KiB
Perl
Executable File
#!/usr/bin/perl -w
|
|
# 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
|
|
# one or more diffs if you want to just update a subset of all the
|
|
# diffs.
|
|
|
|
use strict;
|
|
|
|
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>);
|
|
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;
|
|
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 $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 $!;
|
|
}
|
|
while (<PIPE>) {
|
|
if (m# origin/patch/(.*)#) {
|
|
push(@patches, $1);
|
|
} elsif (m# patch/(.*)#) {
|
|
$local_patch{$1} = 1;
|
|
}
|
|
}
|
|
close PIPE;
|
|
|
|
foreach my $patch (@patches) {
|
|
print "======== $patch ========\n";
|
|
sleep 1 if $incl_generated_files && $last_touch == time;
|
|
if ($local_patch{$patch}) {
|
|
system "git-checkout patch/$patch" and exit 1;
|
|
} else {
|
|
system "git-checkout --track -b patch/$patch origin/patch/$patch" and exit 1;
|
|
}
|
|
|
|
my $parent = 'master';
|
|
open(IN, '<', "PATCH.$patch") or next;
|
|
open(OUT, '>', "patches/$patch.diff") or die $!;
|
|
|
|
while (<IN>) {
|
|
if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
|
|
$parent = "patch/$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|;
|
|
$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;
|
|
}
|
|
$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 $_;
|
|
}
|
|
print OUT $_;
|
|
}
|
|
close PIPE;
|
|
|
|
if ($incl_generated_files) {
|
|
open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
|
|
while (<PIPE>) {
|
|
s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
|
|
print OUT $_;
|
|
}
|
|
close PIPE;
|
|
}
|
|
|
|
close OUT;
|
|
}
|
|
|
|
if ($incl_generated_files) {
|
|
system "rm -rf a b";
|
|
}
|
|
|
|
print "-------- master --------\n";
|
|
sleep 1 if $last_touch == time;
|
|
system "git-checkout master && ./prepare-source";
|