fetch and pull ignore the changelog suite when it is UNRELEASED.

[dgit.git] / dgit-badcommit-fixup

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index bab8605aed270ea83d96f8f3c47ea8896b96fd10..8b202c0ae9617883d31239f6758843122cd2ff5c 100755 (executable)
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -3,15 +3,31 @@
 # Script to help with fallout from #849041.
 #
 # usage:
+#   dgit-badcommit-fixup --check
 #   dgit-badcommit-fixup --test
 #   dgit-badcommit-fixup --real
 
+# Update procedure, from server operator's point of view:
+#
+# 1. Test in an offline tree that this DTRT
+#
+# 2. Announce a transition time.  Tell everyone that between
+#    the transition time and their next upload, they must
+#    run this script.
+#
+# 3. At the transition time, run this script in every repo.
+#
+# 4. Run the mirror script to push changes, if necessary.
+
+
 use strict;
 
 use POSIX;
 use IPC::Open2;
 use Data::Dumper;
 
+our $our_version = 'UNRELEASED'; ###substituted###
+
 my $real;
 
 foreach my $a (@ARGV) {
@@ -19,6 +35,8 @@ foreach my $a (@ARGV) {
        $real = 0;
     } elsif ($a eq '--real') {
        $real = 1;
+    } elsif ($a eq '--check') {
+       $real = -1;
     } else {
        die "$a ?";
     }
@@ -79,7 +97,6 @@ sub rewrite_commit ($) {
     my $m = \ $memo{$obj};
     return $$m if defined $$m;
     my $olddata = getobj $obj, 'commit';
-#print STDERR ">$obj|$olddata<\n";
     $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
     my $msg = $';
     local $_ = $`;
@@ -98,8 +115,10 @@ sub rewrite_commit ($) {
     if ($newdata eq $olddata) {
        $newobj = $obj;
        $count{unchanged}++;
+#print STDERR "UNCHANGED $obj\n";
     } else {
        $newobj = hashobj $newdata, 'commit';
+#print STDERR "REWRITTEN $obj $newobj\n";
     }
     $$m= $newobj;
     return $newobj;
@@ -159,7 +178,12 @@ sub edit_rewrite_map ($) {
        close M or die $!;
     }
 
-    foreach my $up (@updates) {
+    foreach my $oldc (keys %memo) {
+       my $newc = $memo{$oldc};
+       next if $oldc eq $newc;
+       $map{$oldc} = $newc;
+    }
+    foreach my $up (@updates) { # catches tags
        $map{ $up->[1] } = $up->[2];
     }
 
@@ -174,9 +198,11 @@ sub edit_rewrite_map ($) {
        runcmd qw(git add map);
     }
 
-    runcmd qw(git commit -q), 
-       qw(-m), 'dgit-badcommit-fixup',
-       qw(map);
+    runcmd qw(git commit -q), qw(-m), <<END, qw(map);
+dgit-badcommit-fixup
+
+[dgit-badcommit-fixup $our_version]
+END
 
     $!=0; $?=0;
     my $new = `git rev-parse HEAD`;
@@ -205,8 +231,20 @@ foreach my $rline (split /\n/, $refs) {
        or die "$_ ?";
     if ($refname eq 'refs/dgit-rewrite/map') {
        $org_rewrite_map = $obj;
-       continue;
+       next;
+    }
+    next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
+
+    $!=0; $?=0;
+    system qw(sh -ec),
+       'exec >/dev/null git symbolic-ref -q "$1"', qw(x),
+       $refname;
+    if ($?==0) {
+       $count{symrefs_ignored}++;
+       next;
     }
+    die "$? $!" unless $?==256;
+
     my $rewrite;
     if ($type eq 'commit') {
        $rewrite = rewrite_commit($obj);
@@ -230,45 +268,48 @@ if ($bare eq 'true') {
 filter_updates();
 
 if (!@updates) {
-    print Dumper(\%count), "nothing to do\n";
+    print Dumper(\%count), "all is well - nothing to do\n";
     exit 0;
 }
 
 #print Dumper(\@updates);
 
-open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
-
-if ($real && $bare eq 'false') {
-    print "detaching your HEAD\n" or die $!;
-    runcmd 'git checkout --detach';
-}
+open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!
+    if $real >= 0;
 
 for my $up (@updates) {
     my ($ref, $old, $new, $nobackup) = @$up;
     my $otherref = $ref;
     $otherref =~ s{^refs/}{};
-    if ($real) {
+    if ($real > 0) {
        print U <<END or die $! unless $nobackup;
 create refs/dgit-badcommit/$otherref $old
 END
        print U <<END or die $!;
 update $ref $new $old
 END
-    } else {
+    } elsif ($real==0) {
        print U <<END or die $!;
 update refs/dgit-badfixuptest/$otherref $new
 END
+    } else {
+       print "found trouble in history of $ref\n" or die $!;
     }
 }
 
-$?=0; $!=0;
-close U or die "$? $!";
-die $? if $?;
+if ($real >= 0) {
+    $?=0; $!=0;
+    close U or die "$? $!";
+    die $? if $?;
+}
 
 print Dumper(\%count);
 
-if ($real) {
+if ($real >= 0) {
     print "old values saved in refs/dgit-badcommit/\n" or die $!;
-} else {
+} elsif ($real == 0) {
     print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;
+} else {
+    print STDERR "found work to do, exiting status 2\n";
+    exit 2;
 }