Move .gittum to .config/gittum

dotfiles/gittum/bin/metacm → dotfiles/config/gittum/bin/metacm

@@ -12,7 +12,7 @@ mktmpl() {
     local mtmpl_name="$1"; shift
     local mtmpl_path
     local tmpl_path
-    mtmpl_path="$HOME/.gittum/template/$mtmpl_name"
+    mtmpl_path="$HOME/.config/gittum/template/$mtmpl_name"
     test -f "$mtmpl_path" || die "no such meta-template: $mtmpl_path"
     bash -n "$mtmpl_path" || die
     tmpl_path="/.$(mktemp -t gittum-metacm.XXXXXXXX)"

dotfiles/config/gittum/bin/setup

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+gitver=$(git --version | cut -d ' ' -f 3)
+if [[ "x$gitver" > "x1.8" ]]; then
+    tilde='~'
+else
+    tilde=$HOME
+fi
+
+host=$(hostname -s)
+user=$(whoami)
+
+mkconfig() {
+    echo "[include]"
+    echo "    path = $tilde/.config/gittum/main.gitconfig"
+    echo "    path = $tilde/.config/gittum/host/$host.gitconfig"
+    echo "    path = $tilde/.config/gittum/user/$user.gitconfig"
+    echo "    path = $tilde/.config/gittum/private.gitconfig"
+}
+
+mkconfig >>"$HOME/.gitconfig"

dotfiles/gittum/bin/slurp → dotfiles/config/gittum/bin/slurp

@@ -24,6 +24,17 @@ allowed_slurp() {
     test -f "$ok_file"
 }
 
+this_branch_upstream() {
+    #
+    # Print upstream of current bvranch
+    #
+    git branch -vv \
+      | grep '^\*' \
+      | cut -d \] -f1 \
+      | cut -d \[ -f2 \
+      | cut -d :  -f1
+}
+
 allowed_push() {
     #
     # Is push allowed for the remote branch??
@@ -38,15 +49,24 @@ allowed_push() {
     #       main   aaf02f0 [main/master: ahead 25] Some other commit
     #     * master add0a03 [jdsumsion/master] Some commit
     #
-    local tbranch=$(
-        git branch -vv \
-          | grep '^\*' \
-          | cut -d \] -f1 \
-          | cut -d \[ -f2 \
-          | cut -d :  -f1
-    )
+    local tbranch
+    test -n "$ok_file" || return 1
+    tbranch=$(this_branch_upstream)
     test -n "$tbranch" || return 0
-    grep -qxF "PUSH $tbranch" "$ok_file" 2>/dev/null
+    grep -qxE "PUSH ([^ ]+ )?$tbranch" "$ok_file" 2>/dev/null
+}
+
+has_flag() {
+    #
+    # Has $ok_file have flag $1 for this branch?
+    #
+    local flag=$1
+    local tbranch
+    test -n "$ok_file" || return 1
+    tbranch=$(this_branch_upstream)
+    grep -xE "PUSH [^ ]+ $tbranch" "$ok_file" \
+     | cut -d' ' -f2 \
+     | grep -qwe "$flag"
 }
 
 git_relative() {
@@ -92,7 +112,11 @@ go_push() {
     #
     if $force_push || allowed_push;
     then
-        git push -o ci.skip
+        if has_flag ci; then
+            git push
+        else
+            git push -o ci.skip
+        fi
     fi
 }
 
@@ -101,9 +125,11 @@ main() {
     local ok_file
     local force_slurp=false
     local force_push=false
+    local skip_ci=true
     while true; do case $1 in
         --force-slurp)  force_slurp=true; shift ;;
         --force-push)   force_push=true;  shift ;;
+        --skip-ci)      skip_ci=true; shift ;;
         --)             shift; break ;;
         -*)             usage ;;
         *)              break ;;

dotfiles/config/gittum/host/adoref.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/adoref.gitconfig

dotfiles/config/gittum/host/malakar.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/malakar.gitconfig

dotfiles/config/gittum/host/morel.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/morel.gitconfig

dotfiles/config/gittum/host/nauron.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/nauron.gitconfig

dotfiles/config/gittum/host/tamten.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/tamten.gitconfig

dotfiles/config/gittum/host/vagrus.gitconfig

@@ -0,0 +1 @@
+../../../../../../config/dotfiles/gittum/host/vagrus.gitconfig

dotfiles/gittum/main.gitconfig → dotfiles/config/gittum/main.gitconfig

@@ -11,15 +11,19 @@
   blog = log --graph --oneline --pretty=tformat:'%Cred%h%Creset - %C(yellow)%s%Creset %C(green)<%an>%Creset %C(blue)@%d%Creset' --abbrev-commit
   cm = commit --verbose
   cma = commit --verbose --amend
-  cmf = !~/.gittum/bin/metacm msg_flake8
-  cmt = !~/.gittum/bin/metacm msg_tmp
-  cmr = !~/.gittum/bin/metacm msg_typo
-  cmv = !~/.gittum/bin/metacm msg_bumpv
-  cmw = !~/.gittum/bin/metacm msg_wip
+  cme = commit --allow-empty -m 'WIP empty commit just for the kicks'
+  cmv = !~/.config/gittum/bin/metacm msg_bumpv
+  cmw = !~/.config/gittum/bin/metacm msg_wip
   co = checkout
   com = checkout master
   cp = cherry-pick
   dc = !clear && git diff --cached
+  dcw = !clear && git diff --cached --word-diff=color
+  dcp = !clear && git diff --cached --word-diff=porcelain
+  dcc = !clear && git diff --cached --word-diff=color --word-diff-regex=.
+  df = diff --word-diff=color
+  dfp = diff --word-diff=porcelain
+  dfc = diff --word-diff=color --word-diff-regex=.
   gr = log --graph --full-history --color\
        --pretty=tformat:"%x1b[31m%h%x20%x1b[32m%d%x1b[0m%x20%s%x1b[0m"
   gra = log --all --graph --full-history --color\
@@ -34,18 +38,19 @@
   rb = rebase
   rbc = rebase --continue
   rbi = rebase --interactive
-  rme = ! ~/.gittum/bin/remote-edit
+  rme = ! ~/.config/gittum/bin/remote-edit
   rmv = remote --verbose
-  sibling = ! ~/.gittum/bin/sibling
-  slurp = ! ~/.gittum/bin/slurp
+  sibling = ! ~/.config/gittum/bin/sibling
+  slurp = ! ~/.config/gittum/bin/slurp
   st = status
   sh = show
   sw = show --word-diff=color
   swp = show --word-diff=porcelain
   swc = show --word-diff=color --word-diff-regex=.
-  who = ! ~/.gittum/bin/who
-  whoo = ! ~/.gittum/bin/whoo
-  xtragc = ! ~/.gittum/bin/xtragc
+  swm = show --format="format:%B" --no-patch
+  who = ! ~/.config/gittum/bin/who
+  whoo = ! ~/.config/gittum/bin/whoo
+  xtragc = ! ~/.config/gittum/bin/xtragc
 
 [diff]
     guitool = kdiff3

dotfiles/gittum/bin/setup

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-gitver=$(git --version | cut -d ' ' -f 3)
-if [[ "x$gitver" > "x1.8" ]]; then
-    tilde='~'
-else
-    tilde=$HOME
-fi
-
-host=$(hostname -s)
-user=$(whoami)
-
-mkconfig() {
-    echo "[include]"
-    echo "    path = $tilde/.gittum/main.gitconfig"
-    echo "    path = $tilde/.gittum/host/$host.gitconfig"
-    echo "    path = $tilde/.gittum/user/$user.gitconfig"
-    echo "    path = $tilde/.gittum/private.gitconfig"
-}
-
-mkconfig >>"$HOME/.gitconfig"

dotfiles/gittum/template/msg_flake8

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo Flake8

dotfiles/gittum/template/msg_tmp

@@ -1,3 +0,0 @@
-#!/bin/bash
-echo ""
-echo "# use this file to define temporary template"

dotfiles/gittum/template/msg_typo

@@ -1,2 +0,0 @@
-#!/bin/bash
-echo "Fix typo"