README: Convert to asciidoc.

[config/dotfiles.git] / sync.sh

diff --git a/sync.sh b/sync.sh
index 6477d0d9a01c39778a7da9042654baf9a25980d2..6600c889344ea4e21bdcaf554eb373d701bbd95f 100755 (executable)
--- a/sync.sh
+++ b/sync.sh
@@ -5,29 +5,64 @@
 # Allows fetching (no merge) and pushing at the moment.
 
 
-# Select the method, fetch and push is possible.
-if [ x$1 = x -o x$1 = xfetch -o x$1 = xfe ]; then
+# Select the method: fetch, push and status is possible.
+if [ x$1 = x -o x$1 = xstatus -o x$1 = xst ]; then
+    method=status
+elif [ $1 = fetch -o $1 = fe ]; then
     method=fetch
 elif [ $1 = push -o $1 = pu ]; then
     method=push
 else
-    echo "Usage: sync.sh [fetch | fe | push | pu ]"
+    echo "Usage: sync.sh [fetch | fe | push | pu | status | st]"
     echo
     echo "fetch: Fetch from all remotes."
     echo "push: Push to all remotes."
+    echo "status: Display status for all git repositories."
     exit 1
 fi
 
-# Fetch from/Push to each remote of each git subdirectory.
+# Execute the given method for each git subdirectory.
 for project in `find . -name .git -type d`; do
     pwd=`pwd`
     cd "$project"
 
+    # Remove .git from repository name.
+    project=`echo "$project" | sed "s|.git||"`
+
+    # Display all commits not in the master branch (which have to be merged
+    # from the remote branches) or not in the remote branches (which have to
+    # be pushed to the remote hosts).
+    if [ $method = status ]; then
+        # Display a log similar to gitk but for the console.
+        git_log() {
+            output=`git log --graph --all --pretty=oneline --color $1`
+            if [ "x$output" != x ]; then
+                echo $2
+                echo "$output"
+            fi
+        }
+
+        # Display unmerged commits.
+        git_log master.. "$project needs merge:"
+
+        # Display not pushed commits.
+        for branch in `git branch -r`; do
+            branch=`echo "$branch" | sed 's|* ||g'`
+            git_log "$branch.." "$project ($branch) needs push:"
+        done
+
     # Fetch from/Push to all remotes.
-    for remote in `git remote`; do
-        echo "$project: ${method}ing $remote ..."
-        git $method "$remote"
-    done
+    else
+        for remote in `git remote`; do
+            echo "$project: ${method}ing $remote ..."
+            git $method "$remote"
+        done
+    fi
 
     cd "$pwd"
 done
+
+# Run status after a fetch to see new changes.
+if [ $method = fetch ]; then
+    ./sync.sh status
+fi