Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A couple minor improvments to the tar-creation code.
[rsync/rsync.git]
/
support
/
patch-update
diff --git
a/support/patch-update
b/support/patch-update
index
4ed8446
..
20fbcab
100755
(executable)
--- a/
support/patch-update
+++ b/
support/patch-update
@@
-15,17
+15,15
@@
$_ = join('', <IN>);
close IN;
my @extra_files = m{\n([^\s:]+):.*\n\t\S}g;
close IN;
my @extra_files = m{\n([^\s:]+):.*\n\t\S}g;
-my $incl_generated_files;
-
-$incl_generated_files = shift if @ARGV && $ARGV[0] eq '--gen';
+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) {
if ($incl_generated_files) {
- die "'a'
already exists
.\n" if -e 'a';
- die "'b'
already exists
.\n" if -e 'b';
+ 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 "./prepare-source && rsync -a @extra_files a/" and exit 1;
}
+my $last_touch = time;
my(@patches, %local_patch);
if (@ARGV) {
my(@patches, %local_patch);
if (@ARGV) {
@@
-49,18
+47,20
@@
close PIPE;
foreach my $patch (@patches) {
print "======== $patch ========\n";
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;
}
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';
my $parent = 'master';
- open(IN, '<',
'PATCH'
) or next;
+ open(IN, '<',
"PATCH.$patch"
) or next;
open(OUT, '>', "patches/$patch.diff") or die $!;
while (<IN>) {
open(OUT, '>', "patches/$patch.diff") or die $!;
while (<IN>) {
- if (m#patch -p1 <patch/(\S+)\.diff# && $1 ne $patch) {
- $parent =
$1
;
+ if (m#patch -p1 <patch
es
/(\S+)\.diff# && $1 ne $patch) {
+ $parent =
"patch/$1"
;
}
print OUT $_;
}
}
print OUT $_;
}
@@
-70,22
+70,27
@@
foreach my $patch (@patches) {
if (system("git-rebase -m $parent") != 0) {
print qq|"git-rebase -m $parent" incomplete -- please fix.\n|;
$ENV{PS1} = "[$parent] patch/$patch: ";
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};
+ system $ENV{SHELL}
and exit 1
;
}
}
- open(PIPE, '-|', 'git-diff', 'master') or die $!;
- while (<PIPE>) {
- last if m{^diff --git a/PATCH b/PATCH$};
- print OUT $_;
+ if ($incl_generated_files) {
+ system "./prepare-source && rsync -a @extra_files b/" and exit 1;
}
}
- while (<PIPE>) {
- last if m{^diff --git a/};
+ $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 $_;
}
}
- print OUT $_, <PIPE>;
close PIPE;
if ($incl_generated_files) {
close PIPE;
if ($incl_generated_files) {
- system "./prepare-source && rsync -a @extra_files b/" and exit 1;
open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
while (<PIPE>) {
s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
open(PIPE, '-|', 'diff', '-up', 'a', 'b') or die $!;
while (<PIPE>) {
s/^((?:---|\+\+\+) [^\t]+)\t.*/$1/;
@@
-102,4
+107,5
@@
if ($incl_generated_files) {
}
print "-------- master --------\n";
}
print "-------- master --------\n";
+sleep 1 if $last_touch == time;
system "git-checkout master && ./prepare-source";
system "git-checkout master && ./prepare-source";