From ca0f62fad34e450977c738695070b77e39e1d1b0 Mon Sep 17 00:00:00 2001
From: Dmytro Serdiuk <dmytro.serdiuk@gmail.com>
Date: Sat, 30 Nov 2019 12:11:09 +0200
Subject: [PATCH] Support active rebase process during `deliver-work` execution

It happens that there are conflicts during the rebase of the latest
HEAD into the current work branch. And once they are solved, the
`deliver-work` execution one more time allows continuing current
rebase and delivering work.
---
 docs/commands.md                    |  5 +++--
 libexec/git-elegant-deliver-work    | 14 ++++++++++----
 libexec/git-elegant-polish-work     |  3 ++-
 libexec/plugins/rebase              |  6 ++++++
 tests/git-elegant-deliver-work.bats |  9 +++++++++
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 libexec/plugins/rebase

diff --git a/docs/commands.md b/docs/commands.md
index b8ad1bb..b1817c2 100644
--- a/docs/commands.md
+++ b/docs/commands.md
@@ -141,8 +141,9 @@ git elegant acquire-repository
 usage: git elegant deliver-work [branch-name]
 ```
 
-Updates the current branch by rebasing the default upstream branch. Then,
-it pushes HEAD to the appropriate upstream branch.
+Updates the current branch by rebasing the default upstream branch. If there is
+a rebase in progress, the command will continue it instead of initiation a new
+one. Then, it pushes HEAD to the appropriate upstream branch.
 
 By default, the name of remote branch is equal to the local one. If a local
 branch has an upstream branch configured, it will be used as a remote branch.
diff --git a/libexec/git-elegant-deliver-work b/libexec/git-elegant-deliver-work
index fbae086..4b8eb61 100644
--- a/libexec/git-elegant-deliver-work
+++ b/libexec/git-elegant-deliver-work
@@ -15,8 +15,9 @@ MESSAGE
 
 command-description() {
     cat<<MESSAGE
-Updates the current branch by rebasing the default upstream branch. Then,
-it pushes HEAD to the appropriate upstream branch.
+Updates the current branch by rebasing the default upstream branch. If there is
+a rebase in progress, the command will continue it instead of initiation a new
+one. Then, it pushes HEAD to the appropriate upstream branch.
 
 By default, the name of remote branch is equal to the local one. If a local
 branch has an upstream branch configured, it will be used as a remote branch.
@@ -50,8 +51,13 @@ MESSAGE
 }
 
 --deliver-work-logic() {
-    git-verbose fetch
-    git-verbose rebase ${RMASTER}
+    source ${BINS}/plugins/rebase
+    if is-there-active-rebase; then
+        git-verbose rebase --continue
+    else
+        git-verbose fetch
+        git-verbose rebase ${RMASTER}
+    fi
     local upstream=$(git branch --list --format "%(upstream:lstrip=2)" ${1})
     local remote_branch=${upstream/*\//}
     local remote=${upstream/\/*/}
diff --git a/libexec/git-elegant-polish-work b/libexec/git-elegant-polish-work
index 49caa65..2bfbf46 100644
--- a/libexec/git-elegant-polish-work
+++ b/libexec/git-elegant-polish-work
@@ -42,7 +42,8 @@ default() {
         error-box "'master' branch history can't be rewritten. Please read more on ${__site}"
         exit 42
     fi
-    if test -d "$(git rev-parse --git-path rebase-merge)" ||  test -d "$(git rev-parse --git-path rebase-apply)"; then
+    source ${BINS}/plugins/rebase
+    if is-there-active-rebase; then
         git-verbose rebase --continue
     else
         local commits=($(git rev-list ${MASTER}..@))
diff --git a/libexec/plugins/rebase b/libexec/plugins/rebase
new file mode 100644
index 0000000..78ba374
--- /dev/null
+++ b/libexec/plugins/rebase
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# The plugin that wraps some useful operations around `git rebase`.
+
+is-there-active-rebase(){
+    test -d "$(git rev-parse --git-path rebase-merge)" ||  test -d "$(git rev-parse --git-path rebase-apply)"
+}
diff --git a/tests/git-elegant-deliver-work.bats b/tests/git-elegant-deliver-work.bats
index 9fd0c18..309f62f 100644
--- a/tests/git-elegant-deliver-work.bats
+++ b/tests/git-elegant-deliver-work.bats
@@ -73,3 +73,12 @@ teardown() {
     check git-elegant deliver-work
     [[ "${status}" -eq 0 ]]
 }
+
+@test "'deliver-work': current rebase is continued when there is an active rebase process" {
+    repo "git checkout -b feature1"
+    fake-pass "git push --set-upstream --force origin feature1:feature1"
+    fake-pass "git rev-parse --git-path rebase-merge" ".git"
+    check git-elegant deliver-work
+    [[ ${status} -ne 0 ]]
+    [[ ${lines[@]} =~ "No rebase in progress?" ]]
+}