# Full4 Full6 ... Full20:
# The commit object hash plus the commit count, on
# separate lines, eg:
-# Full6 abcdef Full8 abcdeffe
+# Full12 abcdef Full16 abcdeffe
# *23456 _*123456
#
# Full6T Full9T ... Full30T
our $argcounter;
our @forms;
+our %included; # 0 = not at all; 1 = truncated; 2 = full
-sub rjustt ($$;$) { # right justify and truncate (ie, pad and truncate at left)
- # always includes prefix
- my ($sz, $whole, $prefix) = @_;
+sub rjustt ($$$;$) {
+ # right justify and truncate (ie, pad and truncate at left)
+ # always includes prefix
+ # sets $included{$what}
+ my ($sz, $what, $whole, $prefix) = @_;
$prefix //= '';
my $lw = length $whole;
my $spare = $sz - $lw - (length $prefix);
+ $included{$what}= 1 + ($spare > 0);
return
($spare > 0 ? (' ' x $spare) : '').
$prefix.
substr($whole, ($spare < 0 ? -$spare : 0));
}
-sub ljustt ($$;$) {
- my ($sz, $whole, $suffix) = @_;
+sub ljustt ($$$;$) {
+ my ($sz, $what, $whole, $suffix) = @_;
$suffix //= '';
$sz -= length $suffix;
+ $included{$what} = 1 + ($sz >= length $whole);
return sprintf "%-${sz}.${sz}s%s", $whole, $suffix;
}
+sub genform_prep() {
+ $included{$_}=0 foreach qw(Objid Count);
+}
+
sub genform ($@) {
my ($form, @lines) = @_;
gentextmodule($form, @lines);
Chars => (length join '', @lines),
Lines => (scalar @lines),
Ambiguous => ($form =~ m/Full/ && !grep { m/\W/ } @lines),
+ Included => { %included },
};
push @forms, $f;
}
gentextmodule_demo_start_batch();
if (defined($git_count)) {
- my $smallstr = rjustt($sz, $git_count, $git_dirty);
+ genform_prep();
+ my $smallstr = rjustt($sz, 'Count', $git_count, $git_dirty);
my $forgitobj = $sz - length($git_count) - 1;
if (defined($git_object) && $forgitobj >= 2) {
- $smallstr = rjustt($forgitobj, $git_object).
+ $smallstr = ljustt($forgitobj, 'Objid', $git_object).
($git_dirty || ' ').
$git_count;
}
genform_plusq("Small$sz", $smallstr);
}
- genform_plusq("Git$sz", ljustt($sz, $git_object, $git_dirty))
+ genform_prep();
+ genform_plusq("Git$sz", ljustt($sz, 'Objid', $git_object, $git_dirty))
if defined $git_object;
if (defined $git_count && defined $git_object) {
+ genform_prep();
genform("Full".($sz*2),
- ljustt($sz, $git_object),
- rjustt($sz, $git_count, $git_dirty));
+ ljustt($sz, 'Objid', $git_object),
+ rjustt($sz, 'Count', $git_count, $git_dirty));
+ genform_prep();
my $e = $sz;
genform("Full".($e*3)."T",
- ljustt($e*2, $git_object, $git_dirty)
+ ljustt($e*2, 'Objid', $git_object, $git_dirty)
=~ m/.{$e}/g,
- rjustt($e, $git_count));
+ rjustt($e, 'Count', $git_count));
}
}
}
sub do_some_best ($$) {
- my ($modname, $formre) = @_;
+ my ($bestwhat, $formre) = @_;
+ my $modname = "Best$bestwhat";
my $fullmodname = "Commitid_${modname}_2D";
my @argl = qw(max_sz margin=Commitid_pixelsz());
p "module $fullmodname(".argl_formal(@argl).") {\n";
my @do;
foreach my $f (
sort {
+ $b->{Included}{$bestwhat} <=> $a->{Included}{$bestwhat} or
$b->{Chars} <=> $a->{Chars} or
$a->{Lines} <=> $b->{Chars}
}
# (decreasing), and then by number of lines (increasing) and
# try each one both ways round.
- do_some_best('BestCount', 'Small|Full') if $do_git =~ m/c/;
- do_some_best('BestObjid', 'Git|Full') if $do_git =~ m/o/;
+ do_some_best('Count', 'Small|Full') if $do_git =~ m/c/;
+ do_some_best('Objid', 'Git|Full') if $do_git =~ m/o/;
}
while (@ARGV) {