aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Chen <dzc@google.com>2016-04-21 16:16:38 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-04-22 11:48:52 +0000
commit6169a9724c2b82c4c56344fc80b46006d7d68cbb (patch)
treee3e0ac5877e93000fcce10e9994c8ce0db3cc6e8
parent44304fad0709e67ada82945d0fcca016dabee8e6 (diff)
Do not display unhelpful total tasks for GitProgressMonitor.
The [task / total] display when cloning a Git repository using the git_repository rules isn't very helpful, especially since jgit doesn't update totalTasks in a useful way. -- MOS_MIGRATED_REVID=120450834
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/repository/GitProgressMonitor.java17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/GitProgressMonitor.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/GitProgressMonitor.java
index b13987a55d..76d0de4b9d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/GitProgressMonitor.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/GitProgressMonitor.java
@@ -25,8 +25,6 @@ import org.eclipse.jgit.lib.ProgressMonitor;
class GitProgressMonitor implements ProgressMonitor {
private String message;
private EventHandler eventHandler;
- private int totalTasks;
- private int currentTask;
private String workTitle;
private int totalWork;
@@ -38,25 +36,16 @@ class GitProgressMonitor implements ProgressMonitor {
}
@Override
- public void start(int totalTasks) {
- this.totalTasks = totalTasks;
- this.currentTask = 0;
- }
+ public void start(int totalTasks) { }
private void report() {
eventHandler.handle(
- Event.progress("[" + currentTask + " / " + totalTasks + "] "
- + message + ": " + workTitle + " ("
- + completedWork + " / " + totalWork + ")"));
+ Event.progress(message + ": " + workTitle
+ + " (" + completedWork + " / " + totalWork + ")"));
}
@Override
public void beginTask(String title, int totalWork) {
- ++currentTask;
- // TODO(dzc): Remove this when jgit reports totalTasks correctly in start().
- if (currentTask > totalTasks) {
- totalTasks = currentTask;
- }
this.totalWork = totalWork;
this.completedWork = 0;
this.workTitle = title;