gittools update and venv version check

bin/gencode

@@ -1,5 +1,7 @@
 #!/bin/bash -e
 
+tmpfile=`mktemp`
+
 # Fix sort order difference on different platforms.
 export LC_ALL=C
 
@@ -13,6 +15,13 @@ if [[ -n $check ]]; then
     bin/gencode_docs_examples check
 fi
 
+venv/bin/pip3 freeze > $tmpfile
+if ! diff etc/requirements.txt $tmpfile; then
+    echo etc/requirements.txt differences found
+    echo please run bin/setup_base
+    false
+fi
+
 bin/gencode_java
 bin/gencode_python gencode/python schema/*.json
 bin/gencode_docs

bin/git-branch-remote

@@ -43,7 +43,7 @@ git branch -a | while read branch; do
     if git branch | fgrep $branch > /dev/null; then
         lremote=$(git config branch.$branch.remote) || true
         if [[ -z $lremote ]]; then
-            echo "  git branch --set-upstream-to=$leader $branch  # Reconnect orphaned remote branch"
+            echo "  git branch --set-upstream=$leader $branch  # Reconnect orphaned remote branch"
         fi
         continue  # Branch locally, ignore remote...
     fi

bin/git-branch-status

@@ -14,7 +14,7 @@ current=$(git branch --show-current)
 git for-each-ref --format="%(refname:short) %(upstream:short)" refs/heads | \
   while read local remote; do
     if [[ -n $remote ]]; then
-	git rev-list --left-right ${local}...${remote} -- 2>/dev/null >/tmp/git_upstream_status_delta || continue
+        git rev-list --left-right ${local}...${remote} -- 2>/dev/null >/tmp/git_upstream_status_delta || continue
 	LEFT_AHEAD=$(grep -c '^<' /tmp/git_upstream_status_delta)
 	RIGHT_AHEAD=$(grep -c '^>' /tmp/git_upstream_status_delta)
 	if [ "$LEFT_AHEAD" != 0 -a "$RIGHT_AHEAD" != 0 ]; then
@@ -56,6 +56,8 @@ git for-each-ref --format="%(refname:short) %(upstream:short)" refs/heads | \
         description="(git config branch.$local.description 'TEST DESCRIPTION')"
     fi
 
+    difflines=$(git diff --stat master $local -- | egrep "files? changed" | sed -E 's/[a-z ]*//g')
+
     # Add a space after description if it exists
     if [[ -n $description ]]; then
         description="$description "
@@ -66,5 +68,5 @@ git for-each-ref --format="%(refname:short) %(upstream:short)" refs/heads | \
         local="${local}*"
     fi
 
-    printf "%-15s%-35s%s(%s)\n" $local "$OFFSET$POFF" "$description" "$merged"
+    printf "%-15s%-30s%-20s%s(%s)\n" $local "$OFFSET$POFF" "$difflines" "$description" "$merged"
 done

bin/git-branch-update

@@ -52,7 +52,7 @@ while read local remote; do
     fi
 
     if [[ -z $pmsg && -z $remote ]]; then
-        pmsg=" (remote not configured, use 'git push --set-upstream-to $origin $local' to configure)"
+        pmsg=" (remote not configured, use 'git push --set-upstream $origin $local' to configure)"
     fi
 
     echo Updating branch $local$pmsg...
@@ -69,6 +69,10 @@ while read local remote; do
         masterdiff=$(git diff $parent | wc -l) || true
         if [[ $local != $parent && $masterdiff -eq 0 ]]; then
             echo "  git branch -D $local  # Branch is identical to $parent, use to delete"
+            masteroff=$(git rev-list $parent...$local -- | wc -l) || true
+            if [[ $masteroff -ne 0 ]]; then
+                echo "  git switch $local && git reset --hard $parent && git push --force  # To squash redundant commits"
+            fi
         fi
     fi