add HEAD timestamps

Author: bill-auger

git-branch-status

@@ -8,9 +8,6 @@
 
 # this script prints out pretty git branch sync status reports
 
-# TODO: add HEAD dates
-# TODO: data header
-
 
 read -r -d '' USAGE <<-'USAGE'
 usage: git-branch-status
@@ -36,13 +33,18 @@ usage: git-branch-status
     # show the current branch
     $ git-branch-status -b
     $ git-branch-status --branch
-      | current-branch  | (behind 0) | (ahead 2) | origin/current-branch |
+      | current-branch | (behind 0) | (ahead 2) | origin/current-branch |
 
     # show a specific branch
     $ git-branch-status          specific-branch
     $ git-branch-status -b       specific-branch
     $ git-branch-status --branch specific-branch
-      | specific-branch  | (behind 0) | (ahead 2) | origin/specific-branch |
+      | specific-branch | (behind 0) | (ahead 2) | origin/specific-branch |
+
+    # show the timestamp of each HEAD
+    $ git-branch-status -d
+    $ git-branch-status --dates
+      | 1999-12-31:master | (behind 2) | (ahead 0) | 2000-01-01:origin/master |
 
     # print this usage message
     $ git-branch-status -h
@@ -55,42 +57,57 @@ USAGE
 
 function get_refs
 {
-  echo "`git for-each-ref --format="%(refname:short) %(upstream:short)" refs/heads 2> /dev/null`"
+  git for-each-ref --format="%(refname:short) %(upstream:short)" refs/heads 2> /dev/null
 }
 
 function get_status
 {
   git rev-list --left-right ${local}...${remote} -- 2>/dev/null
 }
 
-function current_branch() { echo $(git rev-parse --abbrev-ref HEAD) ; }
+function current_branch
+{
+  git rev-parse --abbrev-ref HEAD
+}
 
-function is_current_branch()
+function is_current_branch # (a_branch_name)
 {
   if [ "$1" == "$(current_branch)" ] ; then echo 1 ; else echo 0 ; fi ;
 }
 
-function does_branch_exist()
+function does_branch_exist # (a_branch_name)
 {
-  is_known_branch=$(git branch | grep -G "^  $1$")
+  is_known_branch=$(git branch | grep -G "^  $1$") # all but current
   [ $(is_current_branch $1) -o $is_known_branch ] && echo 1 || echo 0
 }
 
-function set_filter_or_die
+function set_filter_or_die # (a_branch_name)
 {
   if [ $(does_branch_exist $1) ]
   then branch=$1
   else echo "no such branch: '$1'" ; exit ;
   fi
 }
 
+function get_head_date # (a_commit_ref)
+{
+  author_date=$(git log -n 1 --format=format:"%ai" $1 2> /dev/null)
+  (($SHOW_DATES)) && [ "$author_date" ] && echo "${author_date:0:10}:"
+}
+
+function get_commit_msg # (a_commit_ref)
+{
+  git log -n 1 --format=format:"%s" $1
+}
+
 
 ### switches ###
 
 if [ $1 ] ; then
   if   [ "$1" == "-a" -o "$1" == "--all"    ] ; then readonly SHOW_ALL=1 ;
   elif [ "$1" == "-b" -o "$1" == "--branch" ] ; then
     if [ $2 ] ; then set_filter_or_die $2 ; else branch=$(current_branch) ; fi ;
+  elif [ "$1" == "-d" -o "$1" == "--dates"  ] ; then readonly SHOW_DATES=1 ;
   elif [ "$1" == "-h" -o "$1" == "--help"   ] ; then echo "$USAGE" ; exit ;
   else set_filter_or_die  $1
   fi
@@ -101,7 +118,7 @@ fi
 
 readonly SHOW_ALL_LOCAL=$(($SHOW_ALL  + 0)) # also show branches that have no upstream
 readonly SHOW_ALL_REMOTE=$(($SHOW_ALL + 0)) # also show branches that are up to date
-readonly MAX_COL_W=25
+readonly MAX_COL_W=27
 readonly CWHITE='\033[0;37m'
 readonly CGREEN='\033[0;32m'
 readonly CYELLOW='\033[1;33m'
@@ -169,10 +186,10 @@ do
   fi
 
   # populate lists
-  local_msg="${local:0:$MAX_COL_W}"
+  local_msg="$(get_head_date $local)$local" ;    local_msg="${local_msg:0:$MAX_COL_W}" ;
   behind_msg="$n_behind"
   ahead_msg="$n_ahead"
-  remote_msg="${remote:0:$MAX_COL_W}"
+  remote_msg="$(get_head_date $remote)$remote" ; remote_msg="${remote_msg:0:$MAX_COL_W}" ;
   local_msgs=(    ${local_msgs[@]}    "$local_msg"    )
   behind_msgs=(   ${behind_msgs[@]}   "$behind_msg"   )
   ahead_msgs=(    ${ahead_msgs[@]}    "$ahead_msg"    )
@@ -190,9 +207,11 @@ do
 
 done < <(get_refs)
 
-# compensate width for "(ahead )" and "(behind )" to be appended
-ahead_w=$((  $ahead_w  + 8 ))
-behind_w=$(( $behind_w + 9 ))
+# compensate width for dates and "(ahead )" and "(behind )" to be appended
+# local_w=$((  $local_w  + 11 ))
+ahead_w=$((  $ahead_w  + 8  ))
+behind_w=$(( $behind_w + 9  ))
+# remote_w=$(( $remote_w + 11 ))
 
 # pretty print results
 for (( result_n = 0 ; result_n < ${#local_msgs[@]} ; result_n++ ))
@@ -208,6 +227,7 @@ do
   remote_color="${remote_colors[$result_n]}"
 
   # format data representation
+# echo "this_branch=$this_branch current_branch=$(current_branch)" not_current_branch
   if (($(is_current_branch $this_branch))) ; then star=$STAR ; else star=" " ; fi ;
   local_msg="$this_branch"
   behind_msg="(behind $n_behind)"