motiejus
/
jgit
1
Fork 0
Code Releases Activity

Add setter for ProgressMonitor to StatusCommand 

This is useful if Git.status() is a long running command.

Change-Id: I6bdbf347a688043d549c1f091fb4a264a6c7024e
Signed-off-by: Christian Trutz <christian.trutz@gmail.com>
Signed-off-by: Robin Stocker <robin@nibor.org>
This commit is contained in:
Christian Trutz 2013-07-25 23:28:05 +02:00 committed by Robin Stocker
parent a76a4acf87
commit f677b07b98
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.eclipse.jgit/src/org/eclipse/jgit/api/StatusCommand.java
View File

@ -51,6 +51,7 @@
import org.eclipse.jgit.errors.NoWorkTreeException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.IndexDiff;
import org.eclipse.jgit.lib.ProgressMonitor;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.treewalk.FileTreeIterator;
import org.eclipse.jgit.treewalk.WorkingTreeIterator;
@ -69,6 +70,7 @@
public class StatusCommand extends GitCommand<Status> {
private WorkingTreeIterator workingTreeIt;
private List<String> paths = null;
private ProgressMonitor progressMonitor = null;
/**
* @param repo
@ -124,7 +126,11 @@ public Status call() throws GitAPIException, NoWorkTreeException {
IndexDiff diff = new IndexDiff(repo, Constants.HEAD, workingTreeIt);
if (paths != null)
diff.setFilter(PathFilterGroup.createFromStrings(paths));
diff.diff();
if (progressMonitor == null)
diff.diff();
else
diff.diff(progressMonitor, ProgressMonitor.UNKNOWN,
ProgressMonitor.UNKNOWN, ""); //$NON-NLS-1$
return new Status(diff);
} catch (IOException e) {
throw new JGitInternalException(e.getMessage(), e);
@ -143,4 +149,17 @@ public StatusCommand setWorkingTreeIt(WorkingTreeIterator workingTreeIt) {
this.workingTreeIt = workingTreeIt;
return this;
}
/**
* To set the {@link ProgressMonitor} which contains callback methods to
* inform you about the progress of this command.
*
* @param progressMonitor
* @return {@code this}
* @since 3.1
*/
public StatusCommand setProgressMonitor(ProgressMonitor progressMonitor) {
this.progressMonitor = progressMonitor;
return this;
}
}