X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-badcommit-fixup;h=3995ceb6e8c3349ad6565dcbd6157d0c9061a8db;hp=2708e1ccabe98c5ded0867e8c315700dd7b46b83;hb=5c1ed9665a1ec02cdaa5811e58600edcda0ce3b2;hpb=d93bea01f0863c3fa84a3dea79cb9076dcfd4ff5

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index 2708e1cc..3995ceb6 100755
--- 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 ?";
     }
@@ -41,6 +59,17 @@ my $bare = `git rev-parse --is-bare-repository`;
 die "$? $!" if $?;
 chomp $bare or die;
 
+our @configs;
+foreach my $k (qw(core.sharedRepository)) {
+    $?=0; $!=0; my $v = `set -x; git config --local $k`;
+    if (defined $v && $?==0 && chomp $v) {
+	push @configs, [ $k, $v ];
+    } elsif (defined $v && $?==256 && $v eq '') {
+    } else {
+	die "git-config --local $k => $v $? $! ?";
+    }
+}
+
 sub getobj ($$) {
     my ($obj, $type) = @_;
     print GCFI $obj, "\n" or die $!;
@@ -97,8 +126,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;
@@ -129,9 +160,12 @@ sub rewrite_tag ($) {
     return hashobj $_, 'tag';
 }
 
-sub rewrite_rewrite_map ($) {
+sub edit_rewrite_map ($) {
     my ($old) = @_;
 
+    filter_updates();
+    return $old unless @updates;
+
     my $td = 'dgit-broken-fixup.tmp';
     runcmd qw(rm -rf), $td;
     mkdir $td, 0700 or die "$td $!";
@@ -140,6 +174,9 @@ sub rewrite_rewrite_map ($) {
     runcmd qw(git config gc.auto 0);
     runcmd qw(rm -rf .git/objects);
     symlink "../../objects", ".git/objects" or die $!;
+    foreach my $c (@configs) {
+	runcmd qw(git config), $c->[0], $c->[1];
+    }
 
     my %map;
 
@@ -155,21 +192,31 @@ sub rewrite_rewrite_map ($) {
 	close M or die $!;
     }
 
-    filter_updates();
-    foreach my $up (@updates) {
-	$map{ $_->[1] } = $_->[2];
+    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];
     }
 
     open M, ">", "map" or die $!;
-    print M "%s%s\n",
+    printf M "%s%s\n",
 	$_, (defined $map{$_} ? " $map{$_}" : "")
-	or die $!;
+	or die $!
 	foreach keys %map;
     close M or die $!;
 
-    runcmd qw(git commit -q), 
-	qw(-m), 'dgit-badcommit-fixup',
-	qw(map);
+    if (!$old) {
+	runcmd qw(git add 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`;
@@ -198,8 +245,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);
@@ -216,44 +275,55 @@ if ($bare eq 'true') {
     my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
     push @updates, [ 'refs/dgit-rewrite/map',
 		     ($org_rewrite_map // '0'x40),
-		     $new_rewrite_map ];
+		     ($new_rewrite_map // '0'x40),
+		     1 ];
 }
 
 filter_updates();
 
-#print Dumper(\@updates);
+if (!@updates) {
+    print Dumper(\%count), "all is well - nothing to do\n";
+    exit 0;
+}
 
-open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
+#print Dumper(\@updates);
 
-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) = @$up;
+    my ($ref, $old, $new, $nobackup) = @$up;
     my $otherref = $ref;
     $otherref =~ s{^refs/}{};
-    if ($real) {
-	print U <<END or die $!;
+    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;
 }