1 files changed, 82 insertions, 29 deletions

diff --git a/dot/local/bin/git-ll-remote b/dot/local/bin/git-ll-remote
index 3cc4130..aee13db 100755
--- a/dot/local/bin/git-ll-remote
+++ b/dot/local/bin/git-ll-remote
@@ -27,35 +27,80 @@ have_ref()
 
 show_all_message()
 {
-    >&2 printf '%s\n' \
-        'Showing all remote branches:' \
-        ''
+    cat >&2 <<EOF
+Showing all remote branches:
 
+EOF
 }
 
-show_normal_message()
+show_all_none_message()
 {
-    >&2 printf '%s\n' \
-        'Showing remote branches that have pushed onto your HEAD:' \
-        ''
+    cat >&2 <<EOF
+No remote branches.
+EOF
 }
 
-show_reverse_message()
+show_ahead_message()
 {
-    >&2 printf '%s\n' \
-           'Showing branches unmerged on the REMOTE side (THEY need YOUR changes)' \
-           'because "-r" (reverse) was specified:' \
-           ''
+    cat >&2 <<EOF
+Showing remote branches that are ahead (they have pushed onto your HEAD):
+
+EOF
+}
+
+show_ahead_none_message()
+{
+    x=$(cat <<EOF)
+No remote branches are ahead of your HEAD. %d remote branches were not listed.
+EOF
+    printf "$x\n" "$1" >&2
+
+}
+
+show_behind_message()
+{
+    cat >&2 <<EOF
+Showing remote branches that are behind (your HEAD has commits on top of
+the remote branch):
+
+EOF
+}
+
+show_behind_none_message()
+{
+    x=$(cat <<EOF)
+No remotes branches are behind your HEAD. %d other remote branches were not
+listed.
+EOF
+    printf "$x\n" "$1" >&2
+
+}
+
+show_upto_message()
+{
+    cat >&2 <<EOF
+Showing remote branches that are even with your HEAD.
+
+EOF
+}
+
+show_upto_none_message()
+{
+x=$(cat <<EOF)
+No remote branches are even with your HEAD. %d other remote branches were not
+listed.
+EOF
+    printf "$x\n" "$1" >&2
 }
 
+SHOW=ahead
+[ "$OPT_a" ] && SHOW=all
+[ "$OPT_r" ] && SHOW=behind
+[ "$OPT_u" ] && SHOW=upto
+
 show_message()
 {
-    if [ "$OPT_a" ]
-    then show_all_message
-    elif [ "$OPT_r" ]
-    then show_reverse_message
-    else show_normal_message
-    fi
+    show_${SHOW}_message
 }
 
 git_fetch()
@@ -64,23 +109,36 @@ git_fetch()
     have_ref "$hash" || git fetch "$remote" "$ref"
 }
 
+is_same_ref()
+{
+    [ "$1" = "$2 " ] || [ "$(git rev-parse "$1")" = "$(git rev-parse "$2")" ]
+}
+
 is_ancestor()
 {
-    if [ "$1" = "$2 " ]
-    then false
-    elif [ "$(git rev-parse "$1")" = "$(git rev-parse "$2")" ]
+    if is_same_ref "$1" "$2"
     then false
     else git merge-base --is-ancestor "$1" "$2"
     fi
 }
 
+show_this_remote_branch()
+{
+    local hash="$1"
+    case "$SHOW" in
+        all) true ;;
+        behind) is_ancestor "$hash" HEAD ;;
+        ahead) is_ancestor HEAD "$hash" ;;
+        upto) is_same_ref HEAD "$hash" ;;
+    esac
+}
+
 handle_hash_ref()
 {
     local hash="$1" ref="$2"
     git_fetch "$hash" "$ref" || exit
 
-    [ "$OPT_r" ] && set -- "$hash" HEAD || set -- HEAD "$hash"
-    if [ "$OPT_a" ] || is_ancestor "$1" "$2"
+    if show_this_remote_branch "$hash"
     then
         if [ ! "$OPT_q" -a "$listed" -eq 0 ]
         then
@@ -108,12 +166,7 @@ finalize()
 {
     if [ "$listed" -eq 0 ]
     then
-        if [ "$OPT_r" ]
-        then
-            >&2 printf 'Already up-to-date.  (No remotes are ancestors of your HEAD; %d remotes up-to-date.)\n' "$skipped"
-        else
-            >&2 printf 'Already up-to-date.  (No remotes have pushed onto your HEAD; %d remotes up-to-date.)\n' "$skipped"
-        fi
+        show_${SHOW}_none_message "$skipped"
     fi
 }