Add abort flag to MergeOp

Signed-off-by: Gabriel Roldan <[email protected]>

Author: Gabriel Roldan

src/core/src/main/java/org/locationtech/geogig/plumbing/CleanRefsOp.java

@@ -39,23 +39,20 @@ public class CleanRefsOp extends AbstractGeoGigOp<ImmutableList<String>> {
     @Override
     protected ImmutableList<String> _call() {
         Builder<String> cleaned = new ImmutableList.Builder<String>();
-        Optional<Ref> ref = command(RefParse.class).setName(Ref.MERGE_HEAD).call();
+        Optional<Ref> ref = command(UpdateRef.class).setDelete(true).setName(Ref.MERGE_HEAD).call();
         if (ref.isPresent()) {
             cleaned.add(Ref.MERGE_HEAD);
-            command(UpdateRef.class).setDelete(true).setName(Ref.MERGE_HEAD).call();
         }
-        ref = command(RefParse.class).setName(Ref.ORIG_HEAD).call();
+        ref = command(UpdateRef.class).setDelete(true).setName(Ref.ORIG_HEAD).call();
         if (ref.isPresent()) {
             cleaned.add(Ref.ORIG_HEAD);
-            command(UpdateRef.class).setDelete(true).setName(Ref.ORIG_HEAD).call();
         }
-        ref = command(RefParse.class).setName(Ref.CHERRY_PICK_HEAD).call();
+        ref = command(UpdateRef.class).setDelete(true).setName(Ref.CHERRY_PICK_HEAD).call();
         if (ref.isPresent()) {
             cleaned.add(Ref.CHERRY_PICK_HEAD);
-            command(UpdateRef.class).setDelete(true).setName(Ref.CHERRY_PICK_HEAD).call();
         }
         BlobStore blobStore = context.blobStore();
-        Optional<String> blob = Blobs.getBlobAsString(blobStore, MergeOp.MERGE_MSG);
+        Optional<byte[]> blob = Blobs.getBlob(blobStore, MergeOp.MERGE_MSG);
         if (blob.isPresent()) {
             cleaned.add(MergeOp.MERGE_MSG);
             blobStore.removeBlob(MergeOp.MERGE_MSG);

src/core/src/main/java/org/locationtech/geogig/porcelain/MergeOp.java

@@ -22,6 +22,7 @@
 import org.locationtech.geogig.model.Ref;
 import org.locationtech.geogig.model.RevCommit;
 import org.locationtech.geogig.model.SymRef;
+import org.locationtech.geogig.plumbing.CleanRefsOp;
 import org.locationtech.geogig.plumbing.DiffTree;
 import org.locationtech.geogig.plumbing.FindCommonAncestor;
 import org.locationtech.geogig.plumbing.RefParse;
@@ -61,6 +62,8 @@ public class MergeOp extends AbstractGeoGigOp<MergeOp.MergeReport> {
 
     private boolean theirs;
 
+    private boolean continueMerge;
+
     private boolean noCommit;
 
     private boolean noFastForward;
@@ -82,6 +85,8 @@ public class MergeOp extends AbstractGeoGigOp<MergeOp.MergeReport> {
 
     private Ref origStageHead = null;
 
+    private boolean abort;
+
     /**
      * @param message the message for the merge commit
      * @return {@code this}
@@ -106,6 +111,11 @@ public MergeOp addCommit(final ObjectId commit) {
         return this;
     }
 
+    public MergeOp setAbort() {
+        this.abort = true;
+        return this;
+    }
+
     /**
      * 
      * @param ours true if the "ours" strategy should be used
@@ -177,8 +187,11 @@ public MergeOp setFastForwardOnly(boolean fastForwardOnly) {
      */
     @Override
     protected MergeReport _call() throws RuntimeException {
+        if (abort) {
+            return abort();
+        }
         final List<ObjectId> commits = this.commits;
-        checkArgument(commits.size() > 0, "No commits specified for merge.");
+        checkArgument(continueMerge || commits.size() > 0, "No commits specified for merge.");
         checkArgument(!(ours && theirs), "Cannot use both --ours and --theirs.");
         checkArgument(!(noFastForward && fastForwardOnly), "Cannot use both --no-ff and --ff-only");
 
@@ -349,6 +362,12 @@ protected MergeReport _call() throws RuntimeException {
 
     }
 
+    private MergeReport abort() {
+        command(CleanRefsOp.class).call();
+        conflictsDatabase().removeConflicts(null);
+        return null;
+    }
+
     private Ref doFastForwardMerge(Ref headRef, ObjectId commitId,
             MergeStatusBuilder mergeStatusBuilder) {
         if (headRef instanceof SymRef) {