Mercurial > hg > easyhg
comparison hgrunner.cpp @ 104:af314dd436d5
* Slightly more useful commit dialog
author | Chris Cannam |
---|---|
date | Thu, 25 Nov 2010 14:30:40 +0000 |
parents | dfb7a274b90f |
children | fdca34c989c0 |
comparison
equal
deleted
inserted
replaced
103:0bd32aedc6f6 | 104:af314dd436d5 |
---|---|
45 m_proc = new QProcess(this); | 45 m_proc = new QProcess(this); |
46 | 46 |
47 QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); | 47 QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); |
48 env.insert("LANG", "en_US.utf8"); | 48 env.insert("LANG", "en_US.utf8"); |
49 env.insert("LC_ALL", "en_US.utf8"); | 49 env.insert("LC_ALL", "en_US.utf8"); |
50 env.insert("HGPLAIN", "1"); | |
50 m_proc->setProcessEnvironment(env); | 51 m_proc->setProcessEnvironment(env); |
51 | 52 |
52 m_proc->setProcessChannelMode(QProcess::MergedChannels); | 53 m_proc->setProcessChannelMode(QProcess::MergedChannels); |
53 | 54 |
54 setTextVisible(false); | 55 setTextVisible(false); |
84 return hg; | 85 return hg; |
85 } | 86 } |
86 | 87 |
87 void HgRunner::started() | 88 void HgRunner::started() |
88 { | 89 { |
90 DEBUG << "started" << endl; | |
89 /* | 91 /* |
90 if (procInput) procInput->write("blah\n"); | 92 m_proc->write("blah\n"); |
91 if (procInput) procInput->write("blah\n"); | 93 m_proc->write("blah\n"); |
92 if (procInput) { | 94 m_proc -> closeWriteChannel(); |
93 procInput->close(); | |
94 // ::close(ptyMasterFd); | |
95 } | |
96 proc -> closeWriteChannel(); | |
97 */ | 95 */ |
98 } | 96 } |
99 | 97 |
100 void HgRunner::setProcExitInfo(int procExitCode, QProcess::ExitStatus procExitStatus) | 98 void HgRunner::setProcExitInfo(int procExitCode, QProcess::ExitStatus procExitStatus) |
101 { | 99 { |
228 } | 226 } |
229 } | 227 } |
230 | 228 |
231 void HgRunner::startHgCommand(QString workingDir, QStringList params) | 229 void HgRunner::startHgCommand(QString workingDir, QStringList params) |
232 { | 230 { |
231 #ifdef Q_OS_WIN32 | |
232 // This at least means we won't block on the non-working password prompt | |
233 params.push_front("ui.interactive=false"); | |
234 #else | |
235 // password prompt should work here | |
236 params.push_front("ui.interactive=true"); | |
237 #endif | |
238 params.push_front("--config"); | |
233 startCommand(getHgBinaryName(), workingDir, params); | 239 startCommand(getHgBinaryName(), workingDir, params); |
234 } | 240 } |
235 | 241 |
236 void HgRunner::startCommand(QString command, QString workingDir, QStringList params) | 242 void HgRunner::startCommand(QString command, QString workingDir, QStringList params) |
237 { | 243 { |