Mercurial > hg > easyhg
diff 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 |
line wrap: on
line diff
--- a/hgrunner.cpp Wed Nov 24 22:44:40 2010 +0000 +++ b/hgrunner.cpp Thu Nov 25 14:30:40 2010 +0000 @@ -47,6 +47,7 @@ QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert("LANG", "en_US.utf8"); env.insert("LC_ALL", "en_US.utf8"); + env.insert("HGPLAIN", "1"); m_proc->setProcessEnvironment(env); m_proc->setProcessChannelMode(QProcess::MergedChannels); @@ -86,14 +87,11 @@ void HgRunner::started() { + DEBUG << "started" << endl; /* - if (procInput) procInput->write("blah\n"); - if (procInput) procInput->write("blah\n"); - if (procInput) { - procInput->close(); -// ::close(ptyMasterFd); - } - proc -> closeWriteChannel(); + m_proc->write("blah\n"); + m_proc->write("blah\n"); + m_proc -> closeWriteChannel(); */ } @@ -230,6 +228,14 @@ void HgRunner::startHgCommand(QString workingDir, QStringList params) { +#ifdef Q_OS_WIN32 + // This at least means we won't block on the non-working password prompt + params.push_front("ui.interactive=false"); +#else + // password prompt should work here + params.push_front("ui.interactive=true"); +#endif + params.push_front("--config"); startCommand(getHgBinaryName(), workingDir, params); }