Ohoh, fix loop in re-exec

[buildfarm-client.git] / run_branches

diff --git a/run_branches b/run_branches
index 9e267af44a47318ef6d1a9f263c9e302e6c78e1a..e1d0b9e0d5026797fb3c4b159d99982e239f308d 100755 (executable)
--- a/run_branches
+++ b/run_branches
@@ -34,6 +34,11 @@ if ($0 =~ /(.*)\.pl$/) {
 
 # Most of the client code assumes that our working directory
 # is the client code directory.
+my %CALLED = (
+    cwd => cwd(),
+    argv0 => $0,
+    argv => [@ARGV],   # get a copy!
+);
 chdir $RealBin or die "$0: Can't chdir to '$RealBin': $!\n";
 say "Changed working directory to '$RealBin'" if -t;
 
@@ -72,6 +77,37 @@ $branch = 'global';
 #
 require $buildconf;
 
+# Check if auto-update is wanted and possible
+if (not exists $EximBuild::Conf{auto_update} or $EximBuild::Conf{auto_update})
+{
+    my $remote = $EximBuild::Conf{auto_update} // 'origin';
+
+    die "$0: auto-update not possible: need write permissions in @{[cwd]}\n"
+       if not -w '.';
+
+    # Get information about our remote and calculate the chance for a
+    # successfull auto-updat. Based on:
+    # http://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
+    system("git fetch $remote") == 0 or die $? >> 8;
+    my ($upstream, $local, $base) = qx'git rev-parse ...@{upstream}';   die $? >> 8 if $?;
+    $base =~ s/^\^//;
+
+    if ($upstream ne $local) {
+
+       if ($base ne $local) {
+           warn "$0: the merge base is not local anymore. Refusing to `git pull`\n"
+       }
+       else {
+           # if we're the merge base, the ff-only should work
+           system('git pull --ff-only') == 0 or die $? >> 8;
+           say "$0: re-execute after update";
+           chdir $CALLED{cwd} or die "$0: Can't chdir to $CALLED{cwd}: $!\n";
+           exec $CALLED{argv0}, @{$CALLED{argv}};
+           die "Can't re-exec\n";
+       }
+    }
+}
+
 unless (
     (
         ref $EximBuild::conf{branches_to_build} eq 'ARRAY'