Remove whitespace breakage from perl, tcl and python files

PATCH In review Marco Costalba 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

Marco Costalba

author

2016-06-15 22:43 UTC #0 lore raw

PATCH 4/6 Remove whitespace breakage from perl, tcl and python files

Using 'git apply --whitespace=strip'

Signed-off-by Marco Costalba <[email protected]>

---
 contrib/gitview/gitview  |    2 -
 git-archimport.perl      |  175 +++++++++++++++++++++++-----------------------
 git-cvsexportcommit.perl |    2 +-
 git-cvsimport.perl       |   12 ++--
 git-gui/lib/class.tcl    |    1 -
 git-p4import.py          |    1 -
 git-svnimport.perl       |    4 +-
 gitk                     |    2 +-
 8 files changed, 97 insertions(+), 102 deletions(-)

contrib/gitview/gitview +0 -2

index 2d80e2b..3dc1ef5 100755
@@ -1277,5 +1277,3 @@ if __name__ == "__main__":
 
 	view = GitView( without_diff != 1)
 	view.run(sys.argv[without_diff:])
-
-

git-archimport.perl +87 ~~-88~~

529 lines not on this page · raw message

git-cvsexportcommit.perl +1 -1

index d6ae99b..f95e369 100755
@@ -193,7 +193,7 @@ if (@canstatusfiles) {
 # ... validate new files,
 foreach my $f (@afiles) {
     if (defined ($cvsstat{$f}) and $cvsstat{$f} ne "Unknown") {
- 	$dirty = 1;
+	$dirty = 1;
 	warn "File $f is already known in your CVS checkout -- perhaps it has been added by another user. Or this may

indicate that it exists on a different branch. If this is the case, use -f to force the merge.\n";

 	warn "Status was: $cvsstat{$f}\n";
     }

git-cvsimport.perl +6 -6

index ac74bc5..d41eace 100755
@@ -145,7 +145,7 @@ my $cvs_tree;
 if ($#ARGV == 0) {
 	$cvs_tree = $ARGV[0];
 } elsif (-f 'CVS/Repository') {
-	open my $f, '<', 'CVS/Repository' or
+	open my $f, '<', 'CVS/Repository' or
 	    die 'Failed to open CVS/Repository';
 	$cvs_tree = <$f>;
 	chomp $cvs_tree;

@@ -434,7 +434,7 @@ sub file {
 	my ($self,$fn,$rev) = @_;
 	my $res;
 
-	my ($fh, $name) = tempfile('gitcvs.XXXXXX',
+	my ($fh, $name) = tempfile('gitcvs.XXXXXX',
 		    DIR => File::Spec->tmpdir(), UNLINK => 1);
 
 	$self->_file($fn,$rev) and $res = $self->_line($fh);

@@ -520,8 +520,8 @@ sub is_sha1 {
 
 sub get_headref ($$) {
     my $name    = shift;
-    my $git_dir = shift;
-
+    my $git_dir = shift;
+
     my $f = "$git_dir/refs/heads/$name";
     if (open(my $fh, $f)) {
 	    chomp(my $r = <$fh>);

@@ -771,7 +771,7 @@ sub commit {
 		$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **
 		$xtag =~ tr/_/\./ if ( $opt_u );
 		$xtag =~ s/[\/]/$opt_s/g;
-		
+
 		my $pid = open2($in, $out, 'git-mktag');
 		print $out "object $cid\n".
 		    "type commit\n".

@@ -788,7 +788,7 @@ sub commit {
 		     $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {
 		    die "Cannot create tag object $xtag: $!\n";
 	        }
-		
+
 
 		open(C,">$git_dir/refs/tags/$xtag")
 			or die "Cannot create tag $xtag: $!\n";

git-gui/lib/class.tcl +0 -1

index 88b0565..72494c1 100644
@@ -151,4 +151,3 @@ auto_mkindex_parser::command constructor {name args} {
 		[format { [list source [file join $dir %s]]} \
 		[file split $scriptFile]] "\n"
 }
-

git-p4import.py +0 -1

index 60a758b..0f3d97b 100644
@@ -358,4 +358,3 @@ for id in changes:
     if stitch == 1:
         git.clean_directories()
         stitch = 0
-

git-svnimport.perl +2 -2

index 3af8c7e..f459762 100755
@@ -542,7 +542,7 @@ sub copy_path($$$$$$$$) {
 	if ($node_kind eq $SVN::Node::dir) {
 		$srcpath =~ s#/*$#/#;
 	}
-	
+
 	my $pid = open my $f,'-|';
 	die $! unless defined $pid;
 	if (!$pid) {

@@ -560,7 +560,7 @@ sub copy_path($$$$$$$$) {
 		} else {
 			$p = $path;
 		}
-		push(@$new,[$mode,$sha1,$p]);	
+		push(@$new,[$mode,$sha1,$p]);
 	}
 	close($f) or
 		print STDERR "$newrev:$newbranch: could not list files in $oldpath \@ $rev\n";

gitk +1 -1

index a57e84c..87c3690 100755
@@ -337,7 +337,7 @@ proc readrefs {} {
 		    set tagids($name) $commit
 		    lappend idtags($commit) $name
 		}
-	    }		
+	    }
 	    catch {
 	        set tagcontents($name) [exec git cat-file tag $id]
 	    }

Signature · 1 line

1.5.2.rc3.90.gf33e-dirty