X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=commitid.scad.pl;h=3ea50a0c6bd68497e34fcee0b416c3ec2dc8c670;hp=7245373abcfe7d82d5cc060323cf4d2785a8006e;hb=ba7cb05a57c78ed29fddd5a078336c397ff5b2fb;hpb=7ab596b097406008d88bdd3530398d23b22d1eab

diff --git a/commitid.scad.pl b/commitid.scad.pl
index 7245373..3ea50a0 100755
--- a/commitid.scad.pl
+++ b/commitid.scad.pl
@@ -203,7 +203,7 @@
 #   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
@@ -428,14 +428,17 @@ our $do_git_untracked = 1;
 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
+    # 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.
@@ -446,10 +449,12 @@ 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 ($@) {
@@ -460,6 +465,7 @@ sub genform ($@) {
 	Chars => (length join '', @lines),
 	Lines => (scalar @lines),
 	Ambiguous => ($form =~ m/Full/ && !grep { m/\W/ } @lines),
+	Included => { %included },
     };
     push @forms, $f;
 }
@@ -584,6 +590,7 @@ sub do_some_best ($$) {
     my @do;
     foreach my $f (
         sort {
+	    $b->{Included}{$bestwhat} <=> $a->{Included}{$bestwhat} or
 	    $b->{Chars} <=> $a->{Chars} or
 	    $a->{Lines} <=> $b->{Chars}
         }