diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-03-01 12:05:59 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-03-01 12:05:59 -0500 |
| commit | 268ccbebe39a6c509efdcc1a5c21e8fc55871275 (patch) | |
| tree | f6433c9adb5a6cd96e9dcd3a13a41a79f106571f /org.eclipse.jgit.pgm | |
| parent | da4fe453563ac1dbf8794972a689cf9efbda0e7c (diff) | |
| parent | 68ab451d3907e38f7c259ef52a9c3c6a6ee42ead (diff) | |
| download | jgit-268ccbebe39a6c509efdcc1a5c21e8fc55871275.tar.gz jgit-268ccbebe39a6c509efdcc1a5c21e8fc55871275.zip | |
Merge "ProgressMonitor: Refactor to use background alarms"
Diffstat (limited to 'org.eclipse.jgit.pgm')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java index 506031713a..5cc058950c 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -52,6 +52,7 @@ import java.io.BufferedOutputStream; import java.io.PrintWriter; import java.text.MessageFormat; import java.util.List; +import java.util.concurrent.TimeUnit; import org.eclipse.jgit.diff.DiffAlgorithm; import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; @@ -189,7 +190,9 @@ class Diff extends TextBuiltin { } else if (newTree == null) newTree = new FileTreeIterator(db); - diffFmt.setProgressMonitor(new TextProgressMonitor()); + TextProgressMonitor pm = new TextProgressMonitor(); + pm.setDelayStart(2, TimeUnit.SECONDS); + diffFmt.setProgressMonitor(pm); diffFmt.setPathFilter(pathFilter); if (detectRenames != null) diffFmt.setDetectRenames(detectRenames.booleanValue()); |