3 # Script to help with fallout from #849041.
6 # dgit-badcommit-fixup --check
7 # dgit-badcommit-fixup --test
8 # dgit-badcommit-fixup --real
10 # Update procedure, from server operator's point of view:
12 # 1. Test in an offline tree that this DTRT
14 # 2. Announce a transition time. Tell everyone that between
15 # the transition time and their next upload, they must
18 # 3. At the transition time, run this script in every repo.
20 # 4. Run the mirror script to push changes, if necessary.
29 our $our_version = 'UNRELEASED'; ###substituted###
33 foreach my $a (@ARGV) {
36 } elsif ($a eq '--real') {
38 } elsif ($a eq '--check') {
45 die unless defined $real;
47 my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
51 no warnings qw(recursion);
54 system @_ and die "@_ $! $?";
58 my $bare = `git rev-parse --is-bare-repository`;
63 my ($obj, $type) = @_;
64 print GCFI $obj, "\n" or die $!;
66 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
67 $gtype eq $type or die "$obj $gtype != $type ?";
69 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
71 $x eq "\n" or die "$obj ($_) $!";
77 my ($data,$type) = @_;
78 my $gwopid = open2 \*GWO, \*GWI,
79 "git hash-object -w -t $type --stdin"
81 print GWI $data or die $!;
85 waitpid $gwopid,0 == $gwopid or die $!;
87 m/^(\w+)\n/ or die "$_ ?";
88 $count{"rewritten $type"}++;
94 sub rewrite_commit ($);
95 sub rewrite_commit ($) {
97 my $m = \ $memo{$obj};
98 return $$m if defined $$m;
99 my $olddata = getobj $obj, 'commit';
100 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
103 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
104 $count{'fix overwrite'} += s{^commiter }{committer }gm;
105 if (!m{^author }m && !m{^committer }m) {
106 m{^parent (\w+)}m or die "$obj ?";
107 my $parent = getobj $1, 'commit';
108 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
109 m/\n$/ or die "$obj ?";
111 $count{'fix import'}++;
113 my $newdata = $_.$msg;
115 if ($newdata eq $olddata) {
118 #print STDERR "UNCHANGED $obj\n";
120 $newobj = hashobj $newdata, 'commit';
121 #print STDERR "REWRITTEN $obj $newobj\n";
129 sub filter_updates () {
130 @updates = grep { $_->[1] ne $_->[2] } @updates;
133 sub rewrite_tag ($) {
135 $_ = getobj $obj, 'tag';
136 m/^type (\w+)\n/m or die "$obj ?";
137 if ($1 ne 'commit') {
138 $count{"oddtags $1"}++;
141 m/^object (\w+)\n/m or die "$obj ?";
143 my $newref = rewrite_commit $oldref;
144 if ($oldref eq $newref) {
147 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
148 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
149 return hashobj $_, 'tag';
152 sub edit_rewrite_map ($) {
156 return $old unless @updates;
158 my $td = 'dgit-broken-fixup.tmp';
159 runcmd qw(rm -rf), $td;
160 mkdir $td, 0700 or die "$td $!";
162 runcmd qw(git init -q);
163 runcmd qw(git config gc.auto 0);
164 runcmd qw(rm -rf .git/objects);
165 symlink "../../objects", ".git/objects" or die $!;
170 runcmd qw(git checkout -q), $old;
171 open M, "map" or die $!;
173 m/^(\w+)(?:\s+(\w+))?$/ or die;
175 $count{rewrite_map_previous}++;
181 foreach my $oldc (keys %memo) {
182 my $newc = $memo{$oldc};
183 next if $oldc eq $newc;
186 foreach my $up (@updates) { # catches tags
187 $map{ $up->[1] } = $up->[2];
190 open M, ">", "map" or die $!;
192 $_, (defined $map{$_} ? " $map{$_}" : "")
198 runcmd qw(git add map);
201 runcmd qw(git commit -q), qw(-m), <<END, qw(map);
204 [dgit-badcommit-fixup $our_version]
208 my $new = `git rev-parse HEAD`;
212 chdir '..' or die $!;
213 runcmd qw(rm -rf), $td;
215 $count{rewrite_map_updated}++;
221 my $refs=`git for-each-ref`;
226 our $org_rewrite_map;
228 foreach my $rline (split /\n/, $refs) {
229 my ($obj, $type, $refname) =
230 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
232 if ($refname eq 'refs/dgit-rewrite/map') {
233 $org_rewrite_map = $obj;
236 next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
240 'exec >/dev/null git symbolic-ref -q "$1"', qw(x),
243 $count{symrefs_ignored}++;
246 die "$? $!" unless $?==256;
249 if ($type eq 'commit') {
250 $rewrite = rewrite_commit($obj);
251 } elsif ($type eq 'tag') {
252 $rewrite = rewrite_tag($obj);
254 warn "ref $refname refers to $type\n";
257 push @updates, [ $refname, $obj, $rewrite ];
260 if ($bare eq 'true') {
261 my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
262 push @updates, [ 'refs/dgit-rewrite/map',
263 ($org_rewrite_map // '0'x40),
264 ($new_rewrite_map // '0'x40),
271 print Dumper(\%count), "all is well - nothing to do\n";
275 #print Dumper(\@updates);
277 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!
280 for my $up (@updates) {
281 my ($ref, $old, $new, $nobackup) = @$up;
283 $otherref =~ s{^refs/}{};
285 print U <<END or die $! unless $nobackup;
286 create refs/dgit-badcommit/$otherref $old
288 print U <<END or die $!;
289 update $ref $new $old
292 print U <<END or die $!;
293 update refs/dgit-badfixuptest/$otherref $new
296 print "found trouble in history of $ref\n" or die $!;
302 close U or die "$? $!";
306 print Dumper(\%count);
309 print "old values saved in refs/dgit-badcommit/\n" or die $!;
310 } elsif ($real == 0) {
311 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;
313 print STDERR "found work to do, exiting status 2\n";