MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] fix remote operation execution on Linux

Browse Source 
Was broken in 0ee84fb5c

GitOrigin-RevId: c7031826c77f44371c7bfa303eafdd8241dfdc11
This commit is contained in:
Aleksandr Krasilnikov
2019-05-21 16:18:35 +03:00
committed by intellij-monorepo-bot
parent ffbee57d91
commit b82dfdb0f9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitHandler.java
+11 -2
View File
@@ -65,6 +65,12 @@ public abstract class GitHandler {
@SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"})
protected boolean mySilent; // if true, the command execution is not logged in version control view
@SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"})
private boolean myWithLowPriority;
@SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"})
private boolean myWithNoTty;
@SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"})
private long myStartTime; // git execution start timestamp
private static final long LONG_TIME = 10 * 1000;
@@ -194,14 +200,14 @@ public abstract class GitHandler {
* Execute process with lower priority
*/
public void withLowPriority() {
ExecUtil.setupLowPriorityExecution(myCommandLine);
myWithLowPriority = true;
}
/**
* Detach git process from IDE TTY session
*/
public void withNoTty() {
ExecUtil.setupNoTtyExecution(myCommandLine);
myWithNoTty = true;
}
/**
@@ -476,6 +482,9 @@ public abstract class GitHandler {
checkNotStarted();
try {
if (myWithLowPriority) ExecUtil.setupLowPriorityExecution(myCommandLine);
if (myWithNoTty) ExecUtil.setupNoTtyExecution(myCommandLine);
myStartTime = System.currentTimeMillis();
String logDirectoryPath = myProject != null
? GitImplBase.stringifyWorkingDir(myProject.getBasePath(), myCommandLine.getWorkDirectory())