Allow the user to push local master to a new branch in case of conflict (#508)

* detect that we're in a detached head and show the message

* add a new way to clean local repo in case of failed rebase

1 files changed, 80 insertions, 0 deletions

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt b/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt
new file mode 100644
index 00000000..31c65704
--- /dev/null
+++ b/app/src/main/java/com/zeapo/pwdstore/git/BreakOutOfDetached.kt
@@ -0,0 +1,80 @@
+package com.zeapo.pwdstore.git
+
+import android.app.Activity
+import android.app.AlertDialog
+import com.zeapo.pwdstore.R
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.api.GitCommand
+import org.eclipse.jgit.api.PushCommand
+import org.eclipse.jgit.api.RebaseCommand
+import java.io.File
+
+class BreakOutOfDetached(fileDir: File, callingActivity: Activity) : GitOperation(fileDir, callingActivity) {
+    private lateinit var commands: List<GitCommand<out Any>>
+
+    /**
+     * Sets the command
+     *
+     * @return the current object
+     */
+    fun setCommands(): BreakOutOfDetached {
+        val git = Git(repository)
+        val branchName = "conflicting-master-${System.currentTimeMillis()}"
+
+        this.commands = listOf(
+                // abort the rebase
+                git.rebase().setOperation(RebaseCommand.Operation.ABORT),
+                // git checkout -b conflict-branch
+                git.checkout().setCreateBranch(true).setName(branchName),
+                // push the changes
+                git.push().setRemote("origin"),
+                // switch back to master
+                git.checkout().setName("master")
+        )
+        return this
+    }
+
+    override fun execute() {
+        val git = Git(repository)
+        if (!git.repository.repositoryState.isRebasing) {
+            AlertDialog.Builder(callingActivity)
+                    .setTitle(callingActivity.resources.getString(R.string.git_abort_and_push_title))
+                    .setMessage("The repository is not rebasing, no need to push to another branch")
+                    .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
+                        callingActivity.finish()
+                    }.show()
+            return
+        }
+
+        if (this.provider != null) {
+            // set the credentials for push command
+            this.commands.forEach { cmd ->
+                if (cmd is PushCommand) {
+                    cmd.setCredentialsProvider(this.provider)
+                }
+            }
+        }
+        GitAsyncTask(callingActivity, false, true, this)
+                .execute(*this.commands.toTypedArray())
+    }
+
+    override fun onError(errorMessage: String) {
+        AlertDialog.Builder(callingActivity)
+                .setTitle(callingActivity.resources.getString(R.string.jgit_error_dialog_title))
+                .setMessage("Error occurred when checking out another branch operation $errorMessage")
+                .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
+                    callingActivity.finish()
+                }.show()
+    }
+
+    override fun onSuccess() {
+        AlertDialog.Builder(callingActivity)
+                .setTitle(callingActivity.resources.getString(R.string.git_abort_and_push_title))
+                .setMessage("There was a conflict when trying to rebase. " +
+                        "Your local master branch was pushed to another branch named conflicting-master-....\n" +
+                        "Use this branch to resolve conflict on your computer")
+                .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
+                    callingActivity.finish()
+                }.show()
+    }
+}