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 = shift if @ARGV && $ARGV[0] eq '--gen';
20 system "git-checkout master" and exit 1;
21 if ($incl_generated_files) {
22 die "'a' must not exist in the current directory.\n" if -e 'a';
23 die "'b' must not exist in the current directory.\n" if -e 'b';
24 system "./prepare-source && rsync -a @extra_files a/" and exit 1;
26 my $last_touch = time;
28 my(@patches, %local_patch);
31 s{^(patches|patch|origin/patch)/} {};
35 open(PIPE, '-|', 'git-branch', '-l') or die $!;
37 open(PIPE, '-|', 'git-branch', '-a') or die $!;
40 if (m# origin/patch/(.*)#) {
42 } elsif (m# patch/(.*)#) {
48 my(%parent, %description);
49 foreach my $patch (@patches) {
50 my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
51 open(PIPE, '-|', 'git-diff', "master...$branch", '--', "PATCH.$patch") or die $!;
59 if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
64 $description{$patch} = $desc;
68 foreach my $patch (@patches) {
69 next if $completed{$patch}++;
73 if ($incl_generated_files) {
77 print "-------- master --------\n";
78 sleep 1 if $last_touch == time;
79 system "git-checkout master && ./prepare-source";
88 my $parent = $parent{$patch};
89 if (defined $parent) {
90 unless ($completed{$parent}++) {
91 update_patch($parent);
93 $parent = "patch/$parent";
98 print "======== $patch ========\n";
100 sleep 1 if $incl_generated_files && $last_touch == time;
101 if ($local_patch{$patch}) {
102 system "git-checkout patch/$patch" and exit 1;
104 system "git-checkout --track -b patch/$patch origin/patch/$patch" and exit 1;
107 open(OUT, '>', "patches/$patch.diff") or die $!;
108 print OUT $description{$patch}, "\n";
110 if (system("git-rebase -m $parent") != 0) {
111 print qq|"git-rebase -m $parent" incomplete -- please fix.\n|;
112 $ENV{PS1} = "[$parent] patch/$patch: ";
113 system $ENV{SHELL} and exit 1;
116 if ($incl_generated_files) {
117 system "./prepare-source && rsync -a @extra_files b/" and exit 1;
121 open(PIPE, '-|', 'git-diff', $parent) or die $!;
122 DIFF: while (<PIPE>) {
123 while (m{^diff --git a/PATCH}) {
125 last if m{^diff --git a/};
127 last DIFF if !defined $_;
133 if ($incl_generated_files) {
134 open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
136 s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;