| 1 |
Author: idl0r |
| 2 |
Date: 2009-05-02 13:51:12 +0000 (Sat, 02 May 2009) |
| 3 |
New Revision: 576 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/src/echangelog/echangelog |
| 7 |
Log: |
| 8 |
Whitespace. |
| 9 |
|
| 10 |
Modified: trunk/src/echangelog/echangelog |
| 11 |
=================================================================== |
| 12 |
--- trunk/src/echangelog/echangelog 2009-05-02 12:17:14 UTC (rev 575) |
| 13 |
+++ trunk/src/echangelog/echangelog 2009-05-02 13:51:12 UTC (rev 576) |
| 14 |
@@ -80,12 +80,12 @@ |
| 15 |
my $key = shift; |
| 16 |
|
| 17 |
# Ensure our variable exist |
| 18 |
- if ( defined($ENV{$key}) ) { |
| 19 |
+ if ( defined($ENV{$key}) ) { |
| 20 |
# Ensure we don't get empty variables |
| 21 |
- if ( length($ENV{$key}) > 0 ) { |
| 22 |
+ if ( length($ENV{$key}) > 0 ) { |
| 23 |
return $ENV{$key}; |
| 24 |
- } |
| 25 |
- } |
| 26 |
+ } |
| 27 |
+ } |
| 28 |
return undef; |
| 29 |
} |
| 30 |
|
| 31 |
@@ -156,7 +156,7 @@ |
| 32 |
close C; |
| 33 |
|
| 34 |
$new =~ s/\s+$//; |
| 35 |
- open I, "< $new/skel.ChangeLog" |
| 36 |
+ open I, "< $new/skel.ChangeLog" |
| 37 |
or die "Can't open $new/skel.ChangeLog for input: $!\n"; |
| 38 |
{ local $/ = undef; $text = <I>; } |
| 39 |
close I; |
| 40 |
@@ -181,7 +181,7 @@ |
| 41 |
push @conflicts, $1; |
| 42 |
next; |
| 43 |
} |
| 44 |
- |
| 45 |
+ |
| 46 |
push @conflicts, $1; |
| 47 |
next; |
| 48 |
} elsif (/^\?\s+(\S+)/) { |
| 49 |
@@ -198,18 +198,18 @@ |
| 50 |
} else { |
| 51 |
push @unknown, $1; |
| 52 |
} |
| 53 |
- |
| 54 |
+ |
| 55 |
$actions{$1} = '+'; |
| 56 |
next; |
| 57 |
} elsif (/^([ARMD])\s+\+?\s*(\S+)/) { |
| 58 |
my ($status, $filename) = ($1,$2); |
| 59 |
- |
| 60 |
+ |
| 61 |
if($vcs eq "git") { |
| 62 |
open P, "git rev-parse --sq --show-prefix |"; |
| 63 |
my $prefix = <P>; |
| 64 |
$prefix = substr($prefix, 0, -1); |
| 65 |
close P; |
| 66 |
- |
| 67 |
+ |
| 68 |
if ($filename =~ /$prefix(\S*)/) { |
| 69 |
$filename = $1 ; |
| 70 |
} |
| 71 |
@@ -217,11 +217,11 @@ |
| 72 |
next; |
| 73 |
} |
| 74 |
} |
| 75 |
- |
| 76 |
+ |
| 77 |
if( -d $filename ) { |
| 78 |
next; |
| 79 |
} |
| 80 |
- |
| 81 |
+ |
| 82 |
push @files, $filename; |
| 83 |
($actions{$filename} = $status) =~ tr/DARM/-+-/d; |
| 84 |
} |
| 85 |
@@ -240,12 +240,12 @@ |
| 86 |
# Ignore empty directories - git doesn't version them and cvs removes them. |
| 87 |
if ( (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) && ! -d _ ) { |
| 88 |
open C, $vcs." status $_ 2>&1 1>/dev/null |"; |
| 89 |
- |
| 90 |
+ |
| 91 |
while (<C>) { |
| 92 |
$_ = <C>; |
| 93 |
push @unknown, $object; |
| 94 |
}; |
| 95 |
- |
| 96 |
+ |
| 97 |
close C; |
| 98 |
}; |
| 99 |
} |
| 100 |
@@ -342,7 +342,7 @@ |
| 101 |
# compare suffix number |
| 102 |
return +5 if defined $sna and !defined $snb; |
| 103 |
return -5 if defined $snb and !defined $sna; |
| 104 |
- |
| 105 |
+ |
| 106 |
if (defined $sna) { # and defined $snb |
| 107 |
$retval = ($sna <=> $snb); |
| 108 |
return $retval if $retval; |
| 109 |
@@ -354,7 +354,7 @@ |
| 110 |
# |
| 111 |
return +6 if defined $ra and !defined $rb; |
| 112 |
return -6 if defined $rb and !defined $ra; |
| 113 |
- |
| 114 |
+ |
| 115 |
if (defined $ra) { # and defined $rb |
| 116 |
return ($ra <=> $rb); |
| 117 |
} |
| 118 |
@@ -401,7 +401,7 @@ |
| 119 |
|
| 120 |
if ($vcs eq "git") { |
| 121 |
my $version = $2; |
| 122 |
- |
| 123 |
+ |
| 124 |
while (<C>) { |
| 125 |
last if /^deleted file mode|^index/; |
| 126 |
if (/^new file mode/) { |
| 127 |
@@ -451,7 +451,7 @@ |
| 128 |
mypush(@files, $1); |
| 129 |
mypush(@new_versions, $2); |
| 130 |
} |
| 131 |
- |
| 132 |
+ |
| 133 |
$_ = <C>; |
| 134 |
} |
| 135 |
} |
| 136 |
@@ -519,7 +519,7 @@ |
| 137 |
unlink('ChangeLog.new') if -f 'ChangeLog.new'; |
| 138 |
} |
| 139 |
} |
| 140 |
- |
| 141 |
+ |
| 142 |
unless ($editor) { |
| 143 |
print "Please type the log entry: use Ctrl-d to finish, Ctrl-c to abort...\n"; |
| 144 |
local $/ = undef; |
| 145 |
@@ -572,7 +572,7 @@ |
| 146 |
if (@new_versions) { |
| 147 |
# Insert at the top with a new version marker |
| 148 |
$text =~ s/^( .*? ) # grab header |
| 149 |
- \s*\n(?=\ \ \d|\*|\z) # suck up trailing whitespace |
| 150 |
+ \s*\n(?=\ \ \d|\*|\z) # suck up trailing whitespace |
| 151 |
/"$1\n\n" . |
| 152 |
join("\n", map "*$_ ($date)", reverse @new_versions) . |
| 153 |
"\n\n$entry\n\n"/sxe |
Archives