zanitizer: Reformat with perltidy.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

tools/zanitizer

@@ -19,15 +19,16 @@ use zanitizer_config;
 
 sub eq_tree {
     my ( $a, $b ) = @_;
-    !(grep{!exists $$b{$_} || $$a{$_} ne $$b{$_}} keys %$a) &&
+    !( grep { !exists $$b{$_} || $$a{$_} ne $$b{$_} } keys %$a )
-	!(grep {!exists $$a{$_}} keys %$b)
+      && !( grep { !exists $$a{$_} } keys %$b );
 }
 
 my ( $fast_export_file, $export_marks_file ) = @ARGV;
 
 my %export_marks = ();
 if ( defined $export_marks_file ) {
-    open EXPORT_MARKS, '<', $export_marks_file or die "cannot open $export_marks_file: $!";
+    open EXPORT_MARKS, '<', $export_marks_file
+      or die "cannot open $export_marks_file: $!";
     %export_marks = map { split } <EXPORT_MARKS>;
     close EXPORT_MARKS;
 }
@@ -41,7 +42,8 @@ my %scrubbed_file = ();
 my %deleted_file  = ();
 my %renamed_file  = ();
 
-open FAST_EXPORT, '<', $fast_export_file or die "cannot open $fast_export_file: $!";
+open FAST_EXPORT, '<', $fast_export_file
+  or die "cannot open $fast_export_file: $!";
 $_ = <FAST_EXPORT>;
 while ( defined $_ ) {
     if ( $_ eq "blob\n" ) {
@@ -59,11 +61,13 @@ while (defined $_) {
         my $hash = sha1_hex($data);
         if ( exists $blob_mark{$hash} ) {
             $mark_map{$mark} = $blob_mark{$hash};
-	} else {
+        }
+        else {
             $blob_mark{$hash} = $mark_map{$mark} = $mark;
             print "blob\nmark $mark\ndata ", length $data, "\n", $data, "\n";
         }
-    } elsif (/^reset (?'ref'.*)\n$/s) {
+    }
+    elsif (/^reset (?'ref'.*)\n$/s) {
         my $ref = $+{ref};
         $_ = <FAST_EXPORT>;
         my $from = undef;
@@ -71,9 +75,11 @@ while (defined $_) {
             if ( $_ eq "\n" ) {
                 $_ = <FAST_EXPORT>;
                 last;
-	    } elsif (my ($from_) = /^from (?'from'.*)\n$/s) {
+            }
+            elsif ( my ($from_) = /^from (?'from'.*)\n$/s ) {
                 $from = $+{from};
-	    } else {
+            }
+            else {
                 # The trailing LF on reset is optional
                 last;
             }
@@ -82,11 +88,13 @@ while (defined $_) {
 
         $ref_commit{$ref} = $mark_map{from};
         print "reset $ref\n";
-	print "from $mark_map{$from}\n" if defined $from && defined $mark_map{$from};
+        print "from $mark_map{$from}\n"
+          if defined $from && defined $mark_map{$from};
         print "\n";
 
         next;
-    } elsif (/^commit (?'ref'.*)\n$/s) {
+    }
+    elsif (/^commit (?'ref'.*)\n$/s) {
         my $ref         = $+{ref};
         my ($mark)      = <FAST_EXPORT> =~ /^mark (\S*)\n$/s     or die;
         my ($author)    = <FAST_EXPORT> =~ /^author (.*)\n$/s    or die;
@@ -95,6 +103,7 @@ while (defined $_) {
         read FAST_EXPORT, my ($data), $len;
         $_ = <FAST_EXPORT>;
         my $from = undef;
+
         if (/^from (?'from'.*)\n$/s) {
             $from = $+{from};
             $_    = <FAST_EXPORT>;
@@ -106,6 +115,7 @@ while (defined $_) {
             push @merge, $+{mark};
             $_ = <FAST_EXPORT>;
         }
+
         # git fast-export incorrectly writes M before D when replacing
         # a symlink with a directory.  We move every D before every M
         # to work around this bug.
@@ -114,21 +124,25 @@ while (defined $_) {
         while (1) {
             if ( $_ eq "\n" ) {
                 last;
-	    } elsif (/^D (?'file'.*)\n$/s) {
+            }
+            elsif (/^D (?'file'.*)\n$/s) {
                 $_ = $+{file};
                 scrub_filename;
                 push @delete, { %+, file => $_ } if defined $_;
-	    } elsif (/^M (?'mode'\d+) (?'mark'\S+) (?'file'.*)\n$/s) {
+            }
+            elsif (/^M (?'mode'\d+) (?'mark'\S+) (?'file'.*)\n$/s) {
                 $_ = $+{file};
                 scrub_filename;
                 if ( defined $_ ) {
                     $renamed_file{ $+{file} } = $_ if $_ ne $+{file};
                     $scrubbed_file{$_} = 1 if exists $scrubbed_blob{ $+{mark} };
                     push @modify, { %+, file => $_ };
-		} else {
+                }
+                else {
                     $deleted_file{ $+{file} } = 1;
                 }
-	    } else {
+            }
+            else {
                 die "unhandled command in commit: $_";
             }
             $_ = <FAST_EXPORT>;
@@ -138,9 +152,12 @@ while (defined $_) {
         delete $tree{ $$_{file} } for @delete;
         $tree{ $$_{file} } = "$$_{mode} $mark_map{$$_{mark}}" for @modify;
 
-	if (eq_tree(\%tree, $base_tree) && !(grep {defined $mark_map{$_}} @merge)) {
+        if ( eq_tree( \%tree, $base_tree )
+            && !( grep { defined $mark_map{$_} } @merge ) )
+        {
             $ref_commit{$ref} = $mark_map{$mark} = $base;
-	} else {
+        }
+        else {
             $ref_commit{$ref}   = $mark_map{$mark} = $mark;
             $commit_tree{$mark} = \%tree;
             $_                  = $data;
@@ -149,7 +166,9 @@ while (defined $_) {
                 $_ .= "\n" until /\n\n$/;
                 $_ .= "(imported from commit $export_marks{$mark})\n";
             }
-	    print "commit $ref\nmark $mark\nauthor $author\ncommitter $committer\ndata ", length $_, "\n", $_;
+            print
+"commit $ref\nmark $mark\nauthor $author\ncommitter $committer\ndata ",
+              length $_, "\n", $_;
             if ( defined $from ) {
                 die "unimplemented case" if !defined $mark_map{$from};
                 print "from $mark_map{$from}\n";
@@ -161,9 +180,11 @@ while (defined $_) {
             print "M $$_{mode} $mark_map{$$_{mark}} $$_{file}\n" for @modify;
             print "\n";
         }
-    } elsif (/^progress /) {
+    }
+    elsif (/^progress /) {
         print $_;
-    } else {
+    }
+    else {
         die "unhandled command: $_";
     }
     $_ = <FAST_EXPORT>;

tools/zanitizer_config.pm.sample

@@ -11,7 +11,8 @@ sub scrub_text {
 sub scrub_filename {
     if ( m%^secret-directory/% || m%settings\.ini$% ) {
         undef $_;
-    } else {
+    }
+    else {
         s/bruce/batman/g;
     }
 }