jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

New upstream version.

Browse Source 
committer: mfx <mfx> 979654847 +0000
This commit is contained in:
Markus F.X.J. Oberhumer
2001-01-16 14:20:47 +00:00
parent 8614bca405
commit 9e53f19b02
1 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/cvs2cl.pl
+85 -45
View File
@@ -8,8 +8,8 @@ exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*-
### ### ### ###
############################################################## ##############################################################
## $Revision: 2.29 $ ## $Revision: 2.37 $
## $Date: 2000/09/06 16:57:18 $ ## $Date: 2000/12/28 23:19:48 $
## $Author: kfogel $ ## $Author: kfogel $
## ##
## (C) 1999 Karl Fogel <kfogel@red-bean.com>, under the GNU GPL. ## (C) 1999 Karl Fogel <kfogel@red-bean.com>, under the GNU GPL.
@@ -78,7 +78,7 @@ use File::Basename;
my $Log_Source_Command = "cvs log"; my $Log_Source_Command = "cvs log";
# In case we have to print it out: # In case we have to print it out:
my $VERSION = '$Revision: 2.29 $'; my $VERSION = '$Revision: 2.37 $';
$VERSION =~ s/\S+\s+(\S+)\s+\S+/$1/; $VERSION =~ s/\S+\s+(\S+)\s+\S+/$1/;
## Vars set by options: ## Vars set by options:
@@ -605,6 +605,7 @@ sub derive_change_log ()
undef $file_full_path; undef $file_full_path;
undef %branch_names; undef %branch_names;
undef %branch_numbers; undef %branch_numbers;
undef %symbolic_names;
} }
} }
@@ -1017,7 +1018,7 @@ sub pretty_file_list ()
# Collect the revision numbers' last components, but don't # Collect the revision numbers' last components, but don't
# print them -- they'll get printed with the branch name # print them -- they'll get printed with the branch name
# later. # later.
$$qunkref{'revision'} =~ /.+\.([\d])+$/; $$qunkref{'revision'} =~ /.+\.([\d]+)$/;
push (@brevisions, $1); push (@brevisions, $1);
# todo: we're still collecting branch roots, but we're not # todo: we're still collecting branch roots, but we're not
@@ -1185,17 +1186,18 @@ sub last_line_len ()
# log entries. # log entries.
sub wrap_log_entry () sub wrap_log_entry ()
{ {
my $text = shift; # The text to wrap. my $text = shift; # The text to wrap.
my $left_pad_str = shift; # String to pad with on the left. my $left_pad_str = shift; # String to pad with on the left.
# These do NOT take left_pad_str into account: # These do NOT take left_pad_str into account:
my $length_remaining = shift; # Amount left on current line. my $length_remaining = shift; # Amount left on current line.
my $max_line_length = shift; # Amount left for a blank line. my $max_line_length = shift; # Amount left for a blank line.
my $wrapped_text = ""; # The accumulating wrapped entry. my $wrapped_text = ""; # The accumulating wrapped entry.
my $indentation = ""; # Inherited indentation from prev line. my $user_indent = ""; # Inherited user_indent from prev line.
my $first_time = 1; # Is this the first iteration of the loop? my $first_time = 1; # First iteration of the loop?
my $suppress_line_start_match = 0; # Set to disable line start checks.
my @lines = split (/\n/, $text); my @lines = split (/\n/, $text);
while (@lines) # Don't use `foreach' here, it won't work. while (@lines) # Don't use `foreach' here, it won't work.
@@ -1203,29 +1205,45 @@ sub wrap_log_entry ()
my $this_line = shift (@lines); my $this_line = shift (@lines);
chomp $this_line; chomp $this_line;
# First, if it matches any of the line-start regexps, then print a if ($this_line =~ /^(\s+)/) {
# newline now... $user_indent = $1;
if (($this_line =~ /^(\s*)\*\s+[a-zA-Z0-9]/) }
|| ($this_line =~ /^(\s*)\* [a-zA-Z0-9_\.\/\+-]+/) else {
|| ($this_line =~ /^(\s*)\([a-zA-Z0-9_\.\/\+-]+(\)|,\s*)/) $user_indent = "";
|| ($this_line =~ /^(\s*)- +/) }
|| ($this_line =~ /^(\s*)[^\s]+:\s*$/)
|| ($this_line =~ /^(\s*)\*\) +/) # If it matches any of the line-start regexps, print a newline now...
|| ($this_line =~ /^(\s*)[a-zA-Z0-9](\)|\.|\:) +/)) if ($suppress_line_start_match)
{
$suppress_line_start_match = 0;
}
elsif (($this_line =~ /^(\s*)\*\s+[a-zA-Z0-9]/)
|| ($this_line =~ /^(\s*)\* [a-zA-Z0-9_\.\/\+-]+/)
|| ($this_line =~ /^(\s*)\([a-zA-Z0-9_\.\/\+-]+(\)|,\s*)/)
|| ($this_line =~ /^(\s+)(\S+)/)
|| ($this_line =~ /^(\s*)- +/)
|| ($this_line =~ /^()\s*$/)
|| ($this_line =~ /^(\s*)\*\) +/)
|| ($this_line =~ /^(\s*)[a-zA-Z0-9](\)|\.|\:) +/))
{ {
# Make a line break immediately, unless header separator is set # Make a line break immediately, unless header separator is set
# and this line is the first line in the entry, in which case # and this line is the first line in the entry, in which case
# we're getting the blank line for free already and shouldn't # we're getting the blank line for free already and shouldn't
# add an extra one. # add an extra one.
unless (($After_Header ne " ") and ($first_time)) { unless (($After_Header ne " ") and ($first_time))
{
if ($this_line =~ /^()\s*$/) {
$suppress_line_start_match = 1;
$wrapped_text .= "\n${left_pad_str}";
}
$wrapped_text .= "\n${left_pad_str}"; $wrapped_text .= "\n${left_pad_str}";
} }
$indentation = $1; $length_remaining = $max_line_length - (length ($user_indent));
$length_remaining = $max_line_length - (length ($indentation));
} }
# Now that any indentation has been preserved, strip off leading # Now that any user_indent has been preserved, strip off leading
# whitespace, so up-folding has no ugly side-effects. # whitespace, so up-folding has no ugly side-effects.
$this_line =~ s/^\s*//; $this_line =~ s/^\s*//;
@@ -1233,13 +1251,11 @@ sub wrap_log_entry ()
my $this_len = length ($this_line); my $this_len = length ($this_line);
if ($this_len == 0) if ($this_len == 0)
{ {
# Blank lines should be preserved, and should cancel any # Blank lines should cancel any user_indent level.
# indentation level. $user_indent = "";
$this_line = "\n${left_pad_str}";
$indentation = "";
$length_remaining = $max_line_length; $length_remaining = $max_line_length;
} }
elsif ($this_len >= $length_remaining) elsif ($this_len >= $length_remaining) # Line too long, try breaking it.
{ {
# Walk backwards from the end. At first acceptable spot, break # Walk backwards from the end. At first acceptable spot, break
# a new line. # a new line.
@@ -1260,13 +1276,34 @@ sub wrap_log_entry ()
$this_line .= "\n${left_pad_str}"; $this_line .= "\n${left_pad_str}";
# Make sure the next line is allowed full room. # Make sure the next line is allowed full room.
$length_remaining = $max_line_length - (length ($indentation)); $length_remaining = $max_line_length - (length ($user_indent));
# Strip next_line, but then preserve any indentation. # Strip next_line, but then preserve any user_indent.
$next_line =~ s/^\s*//; $next_line =~ s/^\s*//;
$next_line = $indentation . $next_line;
# Sneak a peek at the user_indent of the upcoming line, so
# $next_line (which will now precede it) can inherit that
# indent level. Otherwise, use whatever user_indent level
# we currently have, which might be none.
my $next_next_line = shift (@lines);
if ((defined ($next_next_line)) && ($next_next_line =~ /^(\s+)/)) {
$next_line = $1 . $next_line if (defined ($1));
# $length_remaining = $max_line_length - (length ($1));
$next_next_line =~ s/^\s*//;
}
else {
$next_line = $user_indent . $next_line;
}
if (defined ($next_next_line)) {
unshift (@lines, $next_next_line);
}
unshift (@lines, $next_line); unshift (@lines, $next_line);
# Our new next line might, coincidentally, begin with one of
# the line-start regexps, so we temporarily turn off
# sensitivity to that until we're past the line.
$suppress_line_start_match = 1;
last; last;
} }
else else
@@ -1275,11 +1312,14 @@ sub wrap_log_entry ()
} }
} }
# If we just bottomed out, the line is too long, so just break
# it where the original text does.
if ($idx == 0) if ($idx == 0)
{ {
if ($length_remaining == ($max_line_length - (length ($indentation)))) # We bottomed out because the line is longer than the
# available space. But that could be because the space is
# small, or because the line is longer than even the maximum
# possible space. Handle both cases below.
if ($length_remaining == ($max_line_length - (length ($user_indent))))
{ {
# The line is simply too long -- there is no hope of ever # The line is simply too long -- there is no hope of ever
# breaking it nicely, so just insert it verbatim, with # breaking it nicely, so just insert it verbatim, with
@@ -1288,9 +1328,9 @@ sub wrap_log_entry ()
} }
else else
{ {
# Can't break it here, but may be able to on the next round. # Can't break it here, but may be able to on the next round...
unshift (@lines, $this_line); unshift (@lines, $this_line);
$length_remaining = $max_line_length - (length ($indentation)); $length_remaining = $max_line_length - (length ($user_indent));
$this_line = "\n${left_pad_str}"; $this_line = "\n${left_pad_str}";
} }
} }
@@ -1315,7 +1355,7 @@ sub wrap_log_entry ()
# Unconditionally indicate that loop has run at least once. # Unconditionally indicate that loop has run at least once.
$first_time = 0; $first_time = 0;
$wrapped_text .= "${this_line}"; $wrapped_text .= "${user_indent}${this_line}";
} }
# One last bit of padding. # One last bit of padding.
@@ -1636,7 +1676,7 @@ Options/Arguments:
-l OPTS, --log-opts OPTS Invoke like this "cvs ... log OPTS" -l OPTS, --log-opts OPTS Invoke like this "cvs ... log OPTS"
FILE1 [FILE2 ...] Show only log information for the named FILE(s) FILE1 [FILE2 ...] Show only log information for the named FILE(s)
See http://www.red-bean.com/~kfogel/cvs2cl.shtml for maintenance and bug info. See http://www.red-bean.com/cvs2cl for maintenance and bug info.
END_OF_INFO END_OF_INFO
} }
@@ -1655,11 +1695,11 @@ information. Basic usage: just run it inside a working copy and a
ChangeLog will appear. It requires repository access (i.e., 'cvs log' ChangeLog will appear. It requires repository access (i.e., 'cvs log'
must work). Run "cvs2cl.pl --help" to see more advanced options. must work). Run "cvs2cl.pl --help" to see more advanced options.
See http://www.red-bean.com/~kfogel/cvs2cl.shtml for updates, and See http://www.red-bean.com/cvs2cl for updates, and for instructions
for instructions on getting anonymous CVS access to this script. on getting anonymous CVS access to this script.
Maintainer: Karl Fogel <kfogel@red-bean.com> Maintainer: Karl Fogel <kfogel@red-bean.com>
Please report bugs to <cvs2cl-bugs@red-bean.com>. Please report bugs to <bug-cvs2cl@red-bean.com>.
=head1 README =head1 README
@@ -1668,11 +1708,11 @@ information. Basic usage: just run it inside a working copy and a
ChangeLog will appear. It requires repository access (i.e., 'cvs log' ChangeLog will appear. It requires repository access (i.e., 'cvs log'
must work). Run "cvs2cl.pl --help" to see more advanced options. must work). Run "cvs2cl.pl --help" to see more advanced options.
See http://www.red-bean.com/~kfogel/cvs2cl.shtml for updates, and See http://www.red-bean.com/cvs2cl for updates, and for instructions
for instructions on getting anonymous CVS access to this script. on getting anonymous CVS access to this script.
Maintainer: Karl Fogel <kfogel@red-bean.com> Maintainer: Karl Fogel <kfogel@red-bean.com>
Please report bugs to <cvs2cl-bugs@red-bean.com>. Please report bugs to <bug-cvs2cl@red-bean.com>.
=head1 PREREQUISITES =head1 PREREQUISITES