瀏覽代碼

[pgm] Prevent commands from writing progress to System.err

Commands which report progress used to write to System.err. This is not
desirable in cases where jgit.pgm is embedded. This change redirects
progress output to the error stream that is configured by the command.

Change-Id: I01fa5e167437e619448ac201fcb1cbf63bad96d7
Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v3.7.0.201502031740-rc1
Rüdiger Herrmann 9 年之前
父節點
當前提交
3285d2f238

+ 1
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java 查看文件

@@ -199,7 +199,7 @@ class Diff extends TextBuiltin {
} else if (newTree == null)
newTree = new FileTreeIterator(db);

TextProgressMonitor pm = new TextProgressMonitor();
TextProgressMonitor pm = new TextProgressMonitor(errw);
pm.setDelayStart(2, TimeUnit.SECONDS);
diffFmt.setProgressMonitor(pm);
diffFmt.setPathFilter(pathFilter);

+ 1
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Fetch.java 查看文件

@@ -123,7 +123,7 @@ class Fetch extends AbstractFetchCommand {
if (thin != null)
fetch.setThin(thin.booleanValue());
if (quiet == null || !quiet.booleanValue())
fetch.setProgressMonitor(new TextProgressMonitor());
fetch.setProgressMonitor(new TextProgressMonitor(errw));

FetchResult result = fetch.call();
if (result.getTrackingRefUpdates().isEmpty())

+ 1
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Gc.java 查看文件

@@ -56,6 +56,6 @@ class Gc extends TextBuiltin {
protected void run() throws Exception {
Git git = Git.wrap(db);
git.gc().setAggressive(aggressive)
.setProgressMonitor(new TextProgressMonitor()).call();
.setProgressMonitor(new TextProgressMonitor(errw)).call();
}
}

+ 1
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/IndexPack.java 查看文件

@@ -71,7 +71,7 @@ class IndexPack extends TextBuiltin {
ObjectDirectoryPackParser imp = (ObjectDirectoryPackParser) p;
imp.setIndexVersion(indexVersion);
}
p.parse(new TextProgressMonitor());
p.parse(new TextProgressMonitor(errw));
inserter.flush();
} finally {
inserter.release();

+ 1
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java 查看文件

@@ -113,7 +113,7 @@ class Push extends TextBuiltin {
PushCommand push = git.push();
push.setDryRun(dryRun);
push.setForce(force);
push.setProgressMonitor(new TextProgressMonitor());
push.setProgressMonitor(new TextProgressMonitor(errw));
push.setReceivePack(receivePack);
push.setRefSpecs(refSpecs);
if (all)

+ 1
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java 查看文件

@@ -110,7 +110,7 @@ class RebuildCommitGraph extends TextBuiltin {
@Argument(index = 1, required = true, metaVar = "metaVar_refs", usage = "usage_logAllPretty")
File graph;

private final ProgressMonitor pm = new TextProgressMonitor();
private final ProgressMonitor pm = new TextProgressMonitor(errw);

private Map<ObjectId, ObjectId> rewrites = new HashMap<ObjectId, ObjectId>();


Loading…
取消
儲存