2 # This script is used to turn one or more of the "patch/*" branches
3 # into one or more diffs in the "patches" directory. Pass the option
4 # --gen if you want generated files in the diffs. Pass the name of
5 # one or more diffs if you want to just update a subset of all the
10 die "No 'patches' directory present in the current dir.\n" unless -d 'patches';
11 die "No '.git' directory present in the current dir.\n" unless -d '.git';
13 open(IN, '<', 'prepare-source.mak') or die "Couldn't open prepare-source.mak: $!\n";
17 my @extra_files = m{\n([^\s:]+):.*\n\t\S}g;
18 my $incl_generated_files;
20 $incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
22 system "git-checkout master" and exit 1;
23 my $last_touch = time;
25 if ($incl_generated_files) {
26 die "'a' must not exist in the current directory.\n" if -e 'a';
27 die "'b' must not exist in the current directory.\n" if -e 'b';
28 system "./prepare-source && rsync -a @extra_files a/" and exit 1;
31 my(@patches, %local_patch);
34 s{^(patches|patch|origin/patch)/} {};
38 open(PIPE, '-|', 'git-branch', '-l') or die $!;
40 open(PIPE, '-|', 'git-branch', '-a') or die $!;
43 if (m# origin/patch/(.*)#) {
45 } elsif (m# patch/(.*)#) {
51 foreach my $patch (@patches) {
52 print "======== $patch ========\n";
53 sleep 1 if $incl_generated_files && $last_touch == time;
54 if ($local_patch{$patch}) {
55 system "git-checkout patch/$patch" and exit 1;
57 system "git-checkout --track -b patch/$patch origin/patch/$patch" and exit 1;
61 my $parent = 'master';
62 open(IN, '<', 'PATCH') or next;
63 open(OUT, '>', "patches/$patch.diff") or die $!;
66 if (m#patch -p1 <patch/(\S+)\.diff# && $1 ne $patch) {
74 if (system("git-rebase -m $parent") != 0) {
75 print qq|"git-rebase -m $parent" incomplete -- please fix.\n|;
76 $ENV{PS1} = "[$parent] patch/$patch: ";
77 system $ENV{SHELL} and exit 1;
80 open(PIPE, '-|', 'git-diff', 'master') or die $!;
82 last if m{^diff --git a/PATCH b/PATCH$};
86 last if m{^diff --git a/};
91 if ($incl_generated_files) {
92 system "./prepare-source && rsync -a @extra_files b/" and exit 1;
93 open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
95 s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
104 if ($incl_generated_files) {
108 print "-------- master --------\n";
109 sleep 1 if $last_touch == time;
110 system "git-checkout master && ./prepare-source";