#
# We can generate these forms:
#
+# In each case:
+# if tree is dirty, * is suffixed or prefixed to count or commitid
+# if tree has untracked files, + is added
+# (where it is added depends on the Form; in any case it does not
+# change the size, but steals space from digits)
+#
# Small3:
# Small4:
# Small5:
# git rev-list --first-parent --count HEAD
# typically 3-4 characters but we allow for up to 6
# padded with zeroes; if too long we reduce mod 10^n
-# eg
-# Small4 1070
-# If tree is dirty, + or * is suffixed, reducing number of
-# digits by 1.
+# eg if the count is 123456
+# Small5 3456*
+# Small8 __123456 (where _ are spaces)
#
# Small4S:
# Small6S: Small6T:
# Small8S: Small9T:
# Small10S:
# same but split into two lines (S) or three lines (T) eg
-# Small4S 10 Small6t 1
-# 70 07
-# 0*
+# Small4S 45 Small6T _3
+# 6* 45
+# 6*
#
# Git4 Git4S
# Git6 Git6S Git6T
# Git9 Git9T
# Git10 Git10S
# git-rev-parse HEAD (prefix of requested length)
-# eg
-# Git6 82f2a2
-# If tree is dirty, + or * is suffixed to commitid,
-# reducing number of hex digits by 1.
+# eg if the commitid is abcdef0123...
+# Git5 abcd*
# Full3
# Full4
# git-rev-list --first-parent --count HEAD
# git-rev-parse HEAD
# eg
-# Full6 82f2a2
-# 1070
-# If tree is dirty, + or * is suffixed to count (but not to
-# commitid) reducing number of digits by 1.
+# Full6 abcdef Full8 abcdef01
+# 23456* _123456*
#
# Full6T
# Full9T
# Full12T
# Full15T
-# As Full but commit is split over two lines for a 3-line message;
-# dirty marker is in commitid.
+# as Full but commit is split over two lines
+# for a 3-line message; eg
+# Full9T abc
+# de*
+# 456
#
# FontDemo
#
our $do_git_untracked = 1;
our $argcounter;
-sub rjustt ($$) { # right justify and truncate (ie, pad and truncate at left)
- my ($sz, $whole) = @_;
+sub rjustt ($$;$) { # right justify and truncate (ie, pad and truncate at left)
+ # always includes prefix
+ my ($sz, $whole, $prefix) = @_;
+ $prefix //= '';
my $lw = length $whole;
- return $lw > $sz
- ? substr($whole, $lw-$sz)
- : sprintf "%${sz}s", $whole;
+ my $spare = $sz - $lw - (length $prefix);
+ return
+ $prefix.
+ ($spare > 0 ? (' ' x $spare) : '').
+ substr($whole, ($spare < 0 ? -$spare : 0));
}
-sub ljustt ($$$) { # always includes $suffix
+sub ljustt ($$;$) {
my ($sz, $whole, $suffix) = @_;
+ $suffix //= '';
$sz -= length $suffix;
return sprintf "%-${sz}.${sz}s%s", $whole, $suffix;
}