3 # Script to help with fallout from #849041.
6 # dgit-badcommit-fixup --test
7 # dgit-badcommit-fixup --real
9 # Update procedure, from server operator's point of view:
11 # 1. Test in an offline tree that this DTRT
13 # 2. Announce a transition time. Tell everyone that between
14 # the transition time and their next upload, they must
17 # 3. At the transition time, run this script in every repo.
19 # 4. Run the mirror script to push changes, if necessary.
28 our $our_version = 'UNRELEASED'; ###substituted###
32 foreach my $a (@ARGV) {
35 } elsif ($a eq '--real') {
42 die unless defined $real;
44 my $gcfpid = open2 \*GCFO, \*GCFI, 'git cat-file --batch' or die $!;
48 no warnings qw(recursion);
51 system @_ and die "@_ $! $?";
55 my $bare = `git rev-parse --is-bare-repository`;
60 my ($obj, $type) = @_;
61 print GCFI $obj, "\n" or die $!;
63 my ($gtype, $gsize) = $x =~ m/^\w+ (\w+) (\d+)\n/ or die "$obj ?";
64 $gtype eq $type or die "$obj $gtype != $type ?";
66 (read GCFO, $gdata, $gsize) == $gsize or die "$obj $!";
68 $x eq "\n" or die "$obj ($_) $!";
74 my ($data,$type) = @_;
75 my $gwopid = open2 \*GWO, \*GWI,
76 "git hash-object -w -t $type --stdin"
78 print GWI $data or die $!;
82 waitpid $gwopid,0 == $gwopid or die $!;
84 m/^(\w+)\n/ or die "$_ ?";
85 $count{"rewritten $type"}++;
91 sub rewrite_commit ($);
92 sub rewrite_commit ($) {
94 my $m = \ $memo{$obj};
95 return $$m if defined $$m;
96 my $olddata = getobj $obj, 'commit';
97 $olddata =~ m/(?<=\n)(?=\n)/ or die "$obj ?";
100 s{^(parent )(\w+)$}{ $1 . rewrite_commit($2) }gme;
101 $count{'fix overwrite'} += s{^commiter }{committer }gm;
102 if (!m{^author }m && !m{^committer }m) {
103 m{^parent (\w+)}m or die "$obj ?";
104 my $parent = getobj $1, 'commit';
105 $parent =~ m/^(?:.+\n)+(author .*\ncommitter .*\n)/;
106 m/\n$/ or die "$obj ?";
108 $count{'fix import'}++;
110 my $newdata = $_.$msg;
112 if ($newdata eq $olddata) {
115 #print STDERR "UNCHANGED $obj\n";
117 $newobj = hashobj $newdata, 'commit';
118 #print STDERR "REWRITTEN $obj $newobj\n";
126 sub filter_updates () {
127 @updates = grep { $_->[1] ne $_->[2] } @updates;
130 sub rewrite_tag ($) {
132 $_ = getobj $obj, 'tag';
133 m/^type (\w+)\n/m or die "$obj ?";
134 if ($1 ne 'commit') {
135 $count{"oddtags $1"}++;
138 m/^object (\w+)\n/m or die "$obj ?";
140 my $newref = rewrite_commit $oldref;
141 if ($oldref eq $newref) {
144 s/^(object )\w+$/ $1.$newref /me or die "$obj ($_) ?";
145 s/^-----BEGIN PGP SIGNATURE-----\n.*^-----END PGP SIGNATURE-----\n$//sm;
146 return hashobj $_, 'tag';
149 sub edit_rewrite_map ($) {
153 return $old unless @updates;
155 my $td = 'dgit-broken-fixup.tmp';
156 runcmd qw(rm -rf), $td;
157 mkdir $td, 0700 or die "$td $!";
159 runcmd qw(git init -q);
160 runcmd qw(git config gc.auto 0);
161 runcmd qw(rm -rf .git/objects);
162 symlink "../../objects", ".git/objects" or die $!;
167 runcmd qw(git checkout -q), $old;
168 open M, "map" or die $!;
170 m/^(\w+)(?:\s+(\w+))?$/ or die;
172 $count{rewrite_map_previous}++;
178 foreach my $oldc (keys %memo) {
179 my $newc = $memo{$oldc};
180 next if $oldc eq $newc;
183 foreach my $up (@updates) { # catches tags
184 $map{ $up->[1] } = $up->[2];
187 open M, ">", "map" or die $!;
189 $_, (defined $map{$_} ? " $map{$_}" : "")
195 runcmd qw(git add map);
198 runcmd qw(git commit -q), qw(-m), <<END, qw(map);
201 [dgit-badcommit-fixup $our_version]
205 my $new = `git rev-parse HEAD`;
209 chdir '..' or die $!;
210 runcmd qw(rm -rf), $td;
212 $count{rewrite_map_updated}++;
218 my $refs=`git for-each-ref`;
223 our $org_rewrite_map;
225 foreach my $rline (split /\n/, $refs) {
226 my ($obj, $type, $refname) =
227 $rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
229 if ($refname eq 'refs/dgit-rewrite/map') {
230 $org_rewrite_map = $obj;
233 next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
235 if ($type eq 'commit') {
236 $rewrite = rewrite_commit($obj);
237 } elsif ($type eq 'tag') {
238 $rewrite = rewrite_tag($obj);
240 warn "ref $refname refers to $type\n";
243 push @updates, [ $refname, $obj, $rewrite ];
246 if ($bare eq 'true') {
247 my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
248 push @updates, [ 'refs/dgit-rewrite/map',
249 ($org_rewrite_map // '0'x40),
250 ($new_rewrite_map // '0'x40),
257 print Dumper(\%count), "nothing to do\n";
261 #print Dumper(\@updates);
263 open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
265 for my $up (@updates) {
266 my ($ref, $old, $new, $nobackup) = @$up;
268 $otherref =~ s{^refs/}{};
270 print U <<END or die $! unless $nobackup;
271 create refs/dgit-badcommit/$otherref $old
273 print U <<END or die $!;
274 update $ref $new $old
277 print U <<END or die $!;
278 update refs/dgit-badfixuptest/$otherref $new
284 close U or die "$? $!";
287 print Dumper(\%count);
290 print "old values saved in refs/dgit-badcommit/\n" or die $!;
292 print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;