Fixed a bug with truncated xattr data requests when the receiver
[rsync/rsync.git] / support / patch-update
CommitLineData
d26c7dfd
WD
1#!/usr/bin/perl -w
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
6# diffs.
7
8use strict;
9
10die "No 'patches' directory present in the current dir.\n" unless -d 'patches';
11die "No '.git' directory present in the current dir.\n" unless -d '.git';
12
67b9b26f
WD
13my @extra_files;
14open(IN, '<', 'Makefile.in') or die "Couldn't open Makefile.in: $!\n";
15while (<IN>) {
16 if (s/^GENFILES=//) {
17 while (s/\\$//) {
18 $_ .= <IN>;
19 }
20 @extra_files = split(' ', $_);
21 last;
22 }
23}
d26c7dfd
WD
24close IN;
25
49ebb358 26my $incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
d26c7dfd 27
6a2456c5 28system "git checkout master" and exit 1;
d26c7dfd 29if ($incl_generated_files) {
18fa9129
WD
30 die "'a' must not exist in the current directory.\n" if -e 'a';
31 die "'b' must not exist in the current directory.\n" if -e 'b';
67b9b26f 32 system "make gen && rsync -a @extra_files a/" and exit 1;
d26c7dfd 33}
49ebb358 34my $last_touch = time;
d26c7dfd
WD
35
36my(@patches, %local_patch);
37if (@ARGV) {
38 foreach (@ARGV) {
39 s{^(patches|patch|origin/patch)/} {};
40 s{\.diff$} {};
41 push(@patches, $_);
42 }
6a2456c5 43 open(PIPE, '-|', 'git', 'branch', '-l') or die $!;
d26c7dfd 44} else {
6a2456c5 45 open(PIPE, '-|', 'git', 'branch', '-a') or die $!;
d26c7dfd
WD
46}
47while (<PIPE>) {
48 if (m# origin/patch/(.*)#) {
49 push(@patches, $1);
50 } elsif (m# patch/(.*)#) {
51 $local_patch{$1} = 1;
52 }
53}
54close PIPE;
55
97f04215 56my(%parent, %description);
d26c7dfd 57foreach my $patch (@patches) {
97f04215 58 my $branch = ($local_patch{$patch} ? '' : 'origin/') . "patch/$patch";
97f04215 59 my $desc = '';
6a2456c5 60 open(PIPE, '-|', 'git', 'diff', '-U1000', "master...$branch", '--', "PATCH.$patch") or die $!;
97f04215 61 while (<PIPE>) {
5288be3a
WD
62 last if /^@@ /;
63 }
64 while (<PIPE>) {
6a2456c5 65 next unless s/^[ +]//;
97f04215
WD
66 if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
67 $parent{$patch} = $1;
68 }
69 $desc .= $_;
70 }
71 $description{$patch} = $desc;
72}
73
74my %completed;
75foreach my $patch (@patches) {
76 next if $completed{$patch}++;
77 update_patch($patch);
78}
79
80if ($incl_generated_files) {
81 system "rm -rf a b";
82}
83
aa6865d7 84sleep 1 if $last_touch == time;
6a2456c5 85system "git checkout master";
aa6865d7 86
97f04215
WD
87exit;
88
89
90sub update_patch
91{
92 my($patch) = @_;
93
94 my $parent = $parent{$patch};
95 if (defined $parent) {
96 unless ($completed{$parent}++) {
97 update_patch($parent);
98 }
99 $parent = "patch/$parent";
100 } else {
101 $parent = 'master';
102 }
103
d26c7dfd 104 print "======== $patch ========\n";
97f04215 105
18fa9129 106 sleep 1 if $incl_generated_files && $last_touch == time;
d26c7dfd 107 if ($local_patch{$patch}) {
6a2456c5 108 system "git checkout patch/$patch" and exit 1;
d26c7dfd 109 } else {
6a2456c5 110 system "git checkout --track -b patch/$patch origin/patch/$patch" and exit 1;
d26c7dfd 111 }
18fa9129 112
d26c7dfd 113 open(OUT, '>', "patches/$patch.diff") or die $!;
97f04215 114 print OUT $description{$patch}, "\n";
d26c7dfd 115
6a2456c5
WD
116 if (system("git rebase -m $parent") != 0) {
117 print qq|"git rebase -m $parent" incomplete -- please fix.\n|;
8d321144 118 $ENV{PS1} = "[$parent] patch/$patch: ";
18fa9129 119 system $ENV{SHELL} and exit 1;
8d321144 120 }
d26c7dfd 121
49ebb358 122 if ($incl_generated_files) {
67b9b26f 123 system "make gen && rsync -a @extra_files b/" and exit 1;
d26c7dfd 124 }
49ebb358
WD
125 $last_touch = time;
126
6a2456c5 127 open(PIPE, '-|', 'git', 'diff', $parent) or die $!;
49ebb358
WD
128 DIFF: while (<PIPE>) {
129 while (m{^diff --git a/PATCH}) {
130 while (<PIPE>) {
131 last if m{^diff --git a/};
132 }
133 last DIFF if !defined $_;
134 }
6a2456c5 135 next if /^index /;
49ebb358 136 print OUT $_;
d26c7dfd 137 }
d26c7dfd
WD
138 close PIPE;
139
140 if ($incl_generated_files) {
d26c7dfd
WD
141 open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
142 while (<PIPE>) {
143 s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
144 print OUT $_;
145 }
146 close PIPE;
147 }
148
149 close OUT;
150}