Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
68cdc3b
)
We only need to deal with local patch branches now.
author
Wayne Davison
<wayned@samba.org>
Wed, 23 Jul 2008 21:32:58 +0000
(14:32 -0700)
committer
Wayne Davison
<wayned@samba.org>
Wed, 23 Jul 2008 21:32:58 +0000
(14:32 -0700)
packaging/patch-update
patch
|
blob
|
blame
|
history
diff --git
a/packaging/patch-update
b/packaging/patch-update
index
f697cd6
..
46d9ff8
100755
(executable)
--- a/
packaging/patch-update
+++ b/
packaging/patch-update
@@
-54,15
+54,13
@@
if ($incl_generated_files) {
}
our $last_touch = time;
}
our $last_touch = time;
-my
(%patches, %local_patch)
;
+my
%patches
;
# Start by finding all patches so that we can load all possible parents.
# Start by finding all patches so that we can load all possible parents.
-open(PIPE, '-|', 'git', 'branch', '-
a
') or die $!;
+open(PIPE, '-|', 'git', 'branch', '-
l
') or die $!;
while (<PIPE>) {
while (<PIPE>) {
- if (m#
origin/
patch/(.*)#) {
+ if (m# patch/(.*)#) {
$patches{$1} = 1;
$patches{$1} = 1;
- } elsif (m# patch/(.*)#) {
- $patches{$1} = $local_patch{$1} = 1;
}
}
close PIPE;
}
}
close PIPE;
@@
-71,7
+69,7
@@
my @patches = sort keys %patches;
my(%parent, %description);
foreach my $patch (@patches) {
my(%parent, %description);
foreach my $patch (@patches) {
- my $branch =
($local_patch{$patch} ? '' : 'origin/') .
"patch/$patch";
+ my $branch = "patch/$patch";
my $desc = '';
open(PIPE, '-|', 'git', 'diff', '-U1000', "$master_branch...$branch", '--', "PATCH.$patch") or die $!;
while (<PIPE>) {
my $desc = '';
open(PIPE, '-|', 'git', 'diff', '-U1000', "$master_branch...$branch", '--', "PATCH.$patch") or die $!;
while (<PIPE>) {
@@
-80,10
+78,14
@@
foreach my $patch (@patches) {
while (<PIPE>) {
next unless s/^[ +]//;
if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
while (<PIPE>) {
next unless s/^[ +]//;
if (m#patch -p1 <patches/(\S+)\.diff# && $1 ne $patch) {
- $parent{$patch} = $1;
+ my $parent = $parent{$patch} = $1;
+ if (!$patches{$parent}) {
+ die "Parent of $patch is not a local branch: $parent\n";
+ }
}
$desc .= $_;
}
}
$desc .= $_;
}
+ close PIPE;
$description{$patch} = $desc;
}
$description{$patch} = $desc;
}
@@
-91,8
+93,11
@@
if (@ARGV) {
# Limit the list of patches to actually process based on @ARGV.
@patches = ( );
foreach (@ARGV) {
# Limit the list of patches to actually process based on @ARGV.
@patches = ( );
foreach (@ARGV) {
- s{^
(patches|patch|origin/patch)
/} {};
+ s{^
patch(es)?
/} {};
s{\.diff$} {};
s{\.diff$} {};
+ if (!$patches{$_}) {
+ die "Local branch not available for patch: $_\n";
+ }
push(@patches, $_);
}
}
push(@patches, $_);
}
}
@@
-130,11
+135,7
@@
sub update_patch
print "======== $patch ========\n";
sleep 1 while $incl_generated_files && $last_touch >= time;
print "======== $patch ========\n";
sleep 1 while $incl_generated_files && $last_touch >= time;
- if ($local_patch{$patch}) {
- system "git checkout patch/$patch" and return 0;
- } else {
- system "git checkout --track -b patch/$patch origin/patch/$patch" and return 0;
- }
+ system "git checkout patch/$patch" and return 0;
my $ok = system("git merge $parent") == 0;
if (!$ok || $launch_shell) {
my $ok = system("git merge $parent") == 0;
if (!$ok || $launch_shell) {