dgit-badcommit-fixup: Put our version in our rewrite map commit message

[dgit.git] / dgit-badcommit-fixup

diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup
index bab8605aed270ea83d96f8f3c47ea8896b96fd10..c119c4acae99f65f8e7e626b0a7960fb54bcb1fd 100755 (executable)
--- a/dgit-badcommit-fixup
+++ b/dgit-badcommit-fixup
@@ -6,12 +6,27 @@
 #   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) {
@@ -79,7 +94,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 +112,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 +175,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 +195,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`;
@@ -207,6 +230,7 @@ foreach my $rline (split /\n/, $refs) {
        $org_rewrite_map = $obj;
        continue;
     }
+    next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
     my $rewrite;
     if ($type eq 'commit') {
        $rewrite = rewrite_commit($obj);
@@ -238,11 +262,6 @@ if (!@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';
-}
-
 for my $up (@updates) {
     my ($ref, $old, $new, $nobackup) = @$up;
     my $otherref = $ref;