Improved ProgressListener.setDescription() and added some more calls in remoting commands

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

Author: Gabriel Roldan

src/api/src/main/java/org/locationtech/geogig/model/Ref.java

@@ -265,7 +265,7 @@ public int compareTo(Ref o) {
      */
     @Override
     public String toString() {
-        return String.format("Ref[%s -> %s]", name, objectId);
+        return String.format("[%s -> %s]", name, objectId);
     }
 
     public static String append(String namespace, String child) {

src/api/src/main/java/org/locationtech/geogig/model/SymRef.java

@@ -53,7 +53,7 @@ public String getTarget() {
 
     @Override
     public String toString() {
-        return String.format("SymRef[%s -> Ref[%s -> %s]]", getName(), target, getObjectId());
+        return String.format("%s -> [%s -> %s]", getName(), target, getObjectId());
     }
 
     /**

src/api/src/main/java/org/locationtech/geogig/repository/DefaultProgressListener.java

@@ -62,14 +62,9 @@ public String getDescription() {
         return description;
     }
 
-    /**
-     * Sets the description of the task.
-     * 
-     * @param description the text to use for the description
-     */
     @Override
-    public void setDescription(String description) {
-        this.description = description;
+    public void setDescription(String format, Object... args) {
+        this.description = String.format(format, args);
     }
 
     /**

src/api/src/main/java/org/locationtech/geogig/repository/ProgressListener.java

@@ -44,9 +44,10 @@ public default String getProgressDescription() {
     /**
      * Sets the description of the current task being run
      * 
-     * @param description
+     * @param format description format like in {@link String#format}
+     * @param args format arguments like in {@link String#format}
      */
-    void setDescription(String description);
+    void setDescription(String format, Object... args);
 
     /**
      * Notifies this listener that the operation begins.
@@ -60,7 +61,7 @@ public default String getProgressDescription() {
      * 
      */
     void setProgress(float progress);
-    
+
     void incrementBy(float amount);
 
     /**

src/api/src/main/java/org/locationtech/geogig/repository/Remote.java

@@ -229,7 +229,7 @@ public String getPassword() {
     }
 
     public @Override String toString() {
-        return String.format("%s", getName());
+        return String.format("%s [%s]", getName(), fetch);
     }
 
     /**

src/api/src/main/java/org/locationtech/geogig/repository/SubProgressListener.java

@@ -77,14 +77,9 @@ public void setProgress(float progress) {
         parentProgressListener.setProgress(start + (amount * percent));
     }
 
-    /**
-     * Sets the description of the task.
-     * 
-     * @param description the text to use for the description
-     */
     @Override
-    public void setDescription(String description) {
-        parentProgressListener.setDescription(description);
+    public void setDescription(String format, Object... args) {
+        parentProgressListener.setDescription(format, args);
     }
 
     /**

src/api/src/test/java/org/locationtech/geogig/model/RefTest.java

@@ -43,7 +43,7 @@ public void testConstructor() throws Exception {
     public void testToString() throws Exception {
         Ref testRef = new Ref(Ref.REFS_PREFIX + "commit1", oid);
 
-        assertEquals("Ref[" + testRef.getName() + " -> " + testRef.getObjectId().toString() + "]",
+        assertEquals("[" + testRef.getName() + " -> " + testRef.getObjectId().toString() + "]",
                 testRef.toString());
     }
 

src/cli/core/src/main/java/org/locationtech/geogig/cli/GeogigCLI.java

@@ -798,11 +798,11 @@ public void started() {
                 }
 
                 @Override
-                public void setDescription(String s) {
+                public void setDescription(String s, Object... args) {
                     lastRun = platform.nanoTime();
                     try {
                         console.println();
-                        console.println(s);
+                        console.println(String.format(s, args));
                         console.flush();
                     } catch (IOException e) {
                         throw new RuntimeException(e);

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

@@ -203,6 +203,7 @@ protected MergeReport _call() throws RuntimeException {
 
         // capture original values in case the operation is cancelled
         origHead = currHead.get();
+        getProgressListener().setDescription(String.format("Merge: merging %s onto %s", commits, origHead));
         if (origHead instanceof SymRef) {
             final String currentBranch = ((SymRef) origHead).getTarget();
             origCurrentBranch = command(RefParse.class).setName(currentBranch).call().get();
@@ -290,17 +291,18 @@ protected MergeReport _call() throws RuntimeException {
                     "Conflicted merge.\nCannot merge more than two commits when conflicts exist"
                             + " or features have been modified in several histories");
             for (ObjectId commitId : commits) {
-                progress.setDescription("Merging commit " + commitId);
-
                 if (headRef.getObjectId().isNull()) {
                     // Fast-forward
                     headRef = doFastForwardMerge(headRef, commitId, mergeStatusBuilder);
                     continue;
                 }
-
-                RevCommit headCommit = repository().getCommit(headRef.getObjectId());
+                final RevCommit headCommit = repository().getCommit(headRef.getObjectId());
                 final RevCommit targetCommit = repository().getCommit(commitId);
 
+                progress.setDescription(String.format("Merging commit %s onto %s",
+                        fmt(targetCommit), fmt(headCommit)));
+
+
                 Optional<ObjectId> ancestorCommit = command(FindCommonAncestor.class)
                         .setLeft(headCommit).setRight(targetCommit).call();
 
@@ -346,22 +348,32 @@ protected MergeReport _call() throws RuntimeException {
 
             progress.complete();
         }
-
         if (!mergeStatusBuilder.isChanged()) {
+            progress.setDescription("Merge: complete, nothing to merge.");
             throw new NothingToCommitException("The branch has already been merged.");
         }
         if (noFastForward) {
             mergeStatusBuilder.setFastFoward(false);
         }
+        progress.setDescription("Creating merge commit");
         RevCommit mergeCommit = commit(mergeStatusBuilder.isFastForward());
 
+        progress.setDescription("Merge: created merge commit " + mergeCommit);
         MergeReport result = new MergeReport(mergeCommit, Optional.fromNullable(mergeScenario),
                 oursId, pairs);
 
         return result;
 
     }
 
+    private String fmt(RevCommit c) {
+        String msg = c.getMessage();
+        if (msg.length() > 30) {
+            msg = msg.substring(0, 30) + "...";
+        }
+        return String.format("%s (%s)", c.getId().toString().substring(0, 8), msg);
+    }
+
     private MergeReport abort() {
         command(CleanRefsOp.class).call();
         conflictsDatabase().removeConflicts(null);
@@ -370,6 +382,9 @@ private MergeReport abort() {
 
     private Ref doFastForwardMerge(Ref headRef, ObjectId commitId,
             MergeStatusBuilder mergeStatusBuilder) {
+        getProgressListener().setDescription(String.format("Fast forward merging %s onto %s",
+                commitId.toString().substring(0, 8),
+                headRef.getObjectId().toString().substring(0, 8)));
         if (headRef instanceof SymRef) {
             final String currentBranch = ((SymRef) headRef).getTarget();
             command(UpdateRef.class).setName(currentBranch).setNewValue(commitId).call();

src/core/src/main/java/org/locationtech/geogig/repository/impl/GeogigTransaction.java

@@ -167,8 +167,12 @@ public void commit(ProgressListener listener) throws ConflictsException {
     }
 
     public void commitSyncTransaction() throws ConflictsException {
+        commitSyncTransaction(DefaultProgressListener.NULL);
+    }
+
+    public void commitSyncTransaction(ProgressListener listener) throws ConflictsException {
         context.command(TransactionEnd.class).setAuthor(authorName.orNull(), authorEmail.orNull())
-                .setTransaction(this).setCancel(false).call();
+                .setTransaction(this).setCancel(false).setProgressListener(listener).call();
     }
 
     public void abort() {