restrict max column width

Author: bill-auger

git-branch-status

@@ -8,7 +8,9 @@
 # this script prints out pretty git branch sync status reports
 
 
-USAGE=<<USAGE
+### constants ###
+
+readonly USAGE=<<USAGE
 usage: git-branch-status
        git-branch-status [-a | --all]
        git-branch-status [-h | --help]
@@ -39,16 +41,7 @@ usage: git-branch-status
 USAGE
 
 
-# switches
-function current_branch() { echo  $(git rev-parse --abbrev-ref HEAD) ; }
-
-function set_filter_or_die
-{
-  if [ "$(current_branch)" == "$1" ] || [ $(git branch | grep -G "^  $1$") ] ; then
-    branch=$1
-  else echo "no such branch: '$1'" ; exit ;
-  fi
-}
+### switches ###
 
 if [ $1 ] ; then
   if   [ "$1" == "-h" -o "$1" == "--help"   ] ; then echo $USAGE ; exit ;
@@ -61,9 +54,9 @@ if [ $1 ] ; then
 fi
 
 
-# constants
 readonly SHOW_ALL_REMOTE=$(($SHOW_ALL + 0)) # also show branches that are up to date
 readonly SHOW_ALL_LOCAL=$(($SHOW_ALL + 0))  # also show branches that have no remote counterpart
+readonly MAX_COL_W=25
 readonly CGREEN='\033[0;32m'
 readonly CYELLOW='\033[1;33m'
 readonly CRED='\033[0;31m'
@@ -75,7 +68,8 @@ readonly CEVEN=$CGREEN
 readonly NO_RESULTS_MSG="${CEVEN}Everything is synchronized.$CEND"
 
 
-# variables
+### variables ###
+
 n_total_differences=0
 local_col_w=0
 ahead_col_w=0
@@ -89,16 +83,30 @@ declare -a ahead_colors=()
 declare -a behind_colors=()
 
 
+### helpers ###
+
+function current_branch() { echo  $(git rev-parse --abbrev-ref HEAD) ; }
+
+function set_filter_or_die
+{
+  if [ "$(current_branch)" == "$1" ] || [ $(git branch | grep -G "^  $1$") ] ; then
+    branch=$1
+  else echo "no such branch: '$1'" ; exit ;
+  fi
+}
+
+
 # loop over all branches
 while read local remote
 do
   # filter branches by name
   [ $branch ] && [ "$branch" != "$local" ] && continue
 
   # parse local<->remote sync status
-  if [ ! -z "$remote" ] ; then
+  if [ $remote ] ; then
     status=$(git rev-list --left-right ${local}...${remote} -- 2>/dev/null)
     [ $(($?)) -eq 0 ] || continue
+
     n_ahead=$( echo $status | tr " " "\n" | grep -c '^<')
     n_behind=$(echo $status | tr " " "\n" | grep -c '^>')
     n_differences=$(($n_ahead + $n_behind))
@@ -111,11 +119,13 @@ do
     if [ "$n_ahead"  -ne 0 ] ; then ahead_color=$CAHEAD ;   else ahead_color=$CEVEN ;  fi ;
     if [ "$n_behind" -ne 0 ] ; then behind_color=$CBEHIND ; else behind_color=$CEVEN ; fi ;
   elif [ "$SHOW_ALL_LOCAL" -eq 1 ] ; then
+    # dummy data for locals
     n_ahead="X" ; n_behind="X" ; remote="n/a" ; ahead_color="$CEVEN" ; behind_color="$CEVEN"
   else continue
   fi
 
   # populate lists
+  local=${local:0:$MAX_COL_W} ; remote=${remote:0:$MAX_COL_W} ;
   local_msgs=(    ${local_msgs[@]}    "$local"        )
   ahead_msgs=(    ${ahead_msgs[@]}    "$n_ahead"      )
   behind_msgs=(   ${behind_msgs[@]}   "$n_behind"     )
@@ -131,7 +141,6 @@ do
 
 done < <(git for-each-ref --format="%(refname:short) %(upstream:short)" refs/heads)
 
-
 # compensate for "(ahead )" and "(behind )" to be appended
 ahead_col_w=$((  $ahead_col_w  + 8  ))
 behind_col_w=$(( $behind_col_w + 10 ))
@@ -159,8 +168,8 @@ do
   end_col_offset=$((    $remote_col_w - ${#remote_msg} ))
 
   # build output messages and print
-  local_msg="%$(($local_col_offset))s $(echo -e   $SPACER $local_msg)"
-  ahead_msg="%$(($ahead_col_offset))s $(echo -e   $SPACER $ahead_color$ahead_msg$CEND)"
+  local_msg="%$(($local_col_offset))s $(  echo -e $SPACER $local_msg)"
+  ahead_msg="%$(($ahead_col_offset))s $(  echo -e $SPACER $ahead_color$ahead_msg$CEND)"
   behind_msg="%$(($behind_col_offset))s $(echo -e $SPACER $behind_color$behind_msg$CEND)"
   remote_msg="%$(($remote_col_offset))s $(echo -e $SPACER $remote_msg)"
   end_msg="%$(($end_col_offset))s $SPACER"