commit e11f94d3e6d6877bdc684eec720323948d678c90
author Shawn O. Pearce <sop@google.com> Mon Apr 16 19:19:01 2012 -0700
committer Shawn O. Pearce <sop@google.com> Mon Apr 16 19:36:51 2012 -0700
tree 98cfc305b95f0cb5e68c8395229371c1bda3c4e3
parent 01967efeba3e9f440649a62e8692f05897954464

Two minor tweaks to change progress monitor

Call it "Processing changes" intead of "Updating changes". This fixes
the weird way of saying "Updating changes: updated 5" when pushing a
lot of new patch sets.

Don't output the magic refs as refs, these don't really matter to
the user and its almost always just one ref. They care more about
the new/updated changes.

Change-Id: Ic4c482cfa35ac60ff99452d1e5b77cd6c53fb05c

gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
index 660b818..c8d741b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java
@@ -152,7 +152,7 @@
     rc.getReceivePack().setPreReceiveHook(this);
 
     progress = new MultiProgressMonitor(
-        new MessageSenderOutputStream(), "Updating changes");
+        new MessageSenderOutputStream(), "Processing changes");
     this.timeoutMillis = timeoutMillis;
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
index d14820a..b8d133e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
@@ -424,7 +424,7 @@
     newProgress = progress.beginSubTask("new", UNKNOWN);
     replaceProgress = progress.beginSubTask("updated", UNKNOWN);
     closeProgress = progress.beginSubTask("closed", UNKNOWN);
-    commandProgress = progress.beginSubTask("refs", commands.size());
+    commandProgress = progress.beginSubTask("refs", UNKNOWN);
 
     parseCommands(commands);
     if (newChange != null
@@ -476,8 +476,8 @@
           replication.scheduleUpdate(project.getNameKey(), c.getRefName());
           Branch.NameKey destBranch = new Branch.NameKey(project.getNameKey(), c.getRefName());
           hooks.doRefUpdatedHook(destBranch, c.getOldId(), c.getNewId(), currentUser.getAccount());
+          commandProgress.update(1);
         }
-        commandProgress.update(1);
       }
     }
     closeProgress.end();