Mercurial > hg > easyhg
view hgrunner.cpp @ 109:1721c580c10e
* Add a queueing mechanism for Hg actions, instead of refusing to start an action if something else is already happening. This is essential now that actions can be prompted by asynchronous events (e.g. filesystem watcher).
* Make Revert behave sensibly
author | Chris Cannam |
---|---|
date | Fri, 26 Nov 2010 12:48:29 +0000 |
parents | fdca34c989c0 |
children | 0f039d3cc38e |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* EasyMercurial Based on HgExplorer by Jari Korhonen Copyright (c) 2010 Jari Korhonen Copyright (c) 2010 Chris Cannam Copyright (c) 2010 Queen Mary, University of London This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "hgrunner.h" #include "common.h" #include "debug.h" #include <QPushButton> #include <QListWidget> #include <QDialog> #include <QLabel> #include <QVBoxLayout> #include <QSettings> #include <QInputDialog> #include <iostream> #include <unistd.h> #include <errno.h> #include <stdio.h> #ifndef Q_OS_WIN32 #ifdef Q_OS_MAC #include <util.h> #else #include <pty.h> #endif #endif HgRunner::HgRunner(QWidget * parent): QProgressBar(parent) { m_proc = new QProcess(this); 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); setTextVisible(false); setVisible(false); m_isRunning = false; m_output.clear(); connect(m_proc, SIGNAL(started()), this, SLOT(started())); connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished(int, QProcess::ExitStatus))); connect(m_proc, SIGNAL(readyRead()), this, SLOT(dataReady())); } HgRunner::~HgRunner() { if (m_ptySlaveFilename != "") { ::close(m_ptyMasterFd); } delete m_proc; } void HgRunner::requestAction(HgAction action) { DEBUG << "requestAction " << action.action << endl; bool pushIt = true; if (m_queue.empty()) { if (action == m_currentAction) { // this request is identical to the thing we're executing DEBUG << "requestAction: we're already handling this one, ignoring identical request" << endl; pushIt = false; } } else { HgAction last = m_queue.back(); if (action == last) { // this request is identical to the previous thing we // queued which we haven't executed yet DEBUG << "requestAction: we're already queueing this one, ignoring identical request" << endl; pushIt = false; } } if (pushIt) m_queue.push_back(action); checkQueue(); } QString HgRunner::getHgBinaryName() { QSettings settings; QString hg = settings.value("hgbinary", "").toString(); if (hg == "") { hg = findExecutable("hg"); } if (hg != "hg") { settings.setValue("hgbinary", hg); } return hg; } void HgRunner::started() { DEBUG << "started" << endl; /* m_proc->write("blah\n"); m_proc->write("blah\n"); m_proc -> closeWriteChannel(); */ } void HgRunner::noteUsername(QString name) { m_userName = name; } void HgRunner::noteRealm(QString realm) { m_realm = realm; } void HgRunner::getUsername() { if (m_procInput) { bool ok = false; QString prompt = tr("User name:"); if (m_realm != "") { prompt = tr("User name for \"%1\":").arg(m_realm); } QString pwd = QInputDialog::getText (qobject_cast<QWidget *>(parent()), tr("Enter user name"), prompt, QLineEdit::Normal, QString(), &ok); if (ok) { m_procInput->write(QString("%1\n").arg(pwd).toUtf8()); m_procInput->flush(); return; } } // user cancelled or something went wrong killCurrentCommand(); } void HgRunner::getPassword() { if (m_procInput) { bool ok = false; QString prompt = tr("Password:"); if (m_userName != "") { if (m_realm != "") { prompt = tr("Password for \"%1\" at \"%2\":") .arg(m_userName).arg(m_realm); } else { prompt = tr("Password for user \"%1\":") .arg(m_userName); } } QString pwd = QInputDialog::getText (qobject_cast<QWidget *>(parent()), tr("Enter password"), prompt, QLineEdit::Password, QString(), &ok); if (ok) { m_procInput->write(QString("%1\n").arg(pwd).toUtf8()); m_procInput->flush(); return; } } // user cancelled or something went wrong killCurrentCommand(); } void HgRunner::checkPrompts(QString chunk) { //DEBUG << "checkPrompts: " << chunk << endl; QString text = chunk.trimmed(); QString lower = text.toLower(); if (lower.endsWith("password:")) { getPassword(); return; } if (lower.endsWith("user:")) { getUsername(); return; } QRegExp userRe("\\buser:\\s*([^\\s]+)"); if (userRe.indexIn(text) >= 0) { noteUsername(userRe.cap(1)); } QRegExp realmRe("\\brealmr:\\s*([^\\s]+)"); if (realmRe.indexIn(text) >= 0) { noteRealm(realmRe.cap(1)); } } void HgRunner::dataReady() { DEBUG << "dataReady" << endl; QString chunk = QString::fromUtf8(m_proc->readAll()); m_output += chunk; checkPrompts(chunk); } void HgRunner::finished(int procExitCode, QProcess::ExitStatus procExitStatus) { // Save the current action and reset m_currentAction before we // emit a signal to mark the completion; otherwise we may be // resetting the action after a slot has already tried to set it // to something else to start a new action HgAction completedAction = m_currentAction; m_isRunning = false; m_currentAction = HgAction(); closeProcInput(); if (completedAction.action == ACT_NONE) { DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl; } if (procExitCode == 0 && procExitStatus == QProcess::NormalExit) { DEBUG << "HgRunner::finished: Command completed successfully" << endl; //!!! NB this is all output not stdout as it should be emit commandCompleted(completedAction, m_output); } else { DEBUG << "HgRunner::finished: Command failed" << endl; //!!! NB this is all output not stderr as it should be emit commandFailed(completedAction, m_output); } checkQueue(); } /* bool HgRunner::isCommandRunning() { return m_isRunning; } */ void HgRunner::killCurrentCommand() { if (m_isRunning) { m_proc -> kill(); } } void HgRunner::checkQueue() { if (m_isRunning) { return; } if (m_queue.empty()) { hide(); return; } HgAction toRun = m_queue.front(); m_queue.pop_front(); DEBUG << "checkQueue: have action: running " << toRun.action << endl; startCommand(toRun); } void HgRunner::startCommand(HgAction action) { QString executable = action.executable; bool interactive = false; QStringList params = action.params; if (executable == "") { // This is a Hg command executable = getHgBinaryName(); #ifdef Q_OS_WIN32 // This at least means we won't block on the non-working password prompt params.push_front("--noninteractive"); #else // password prompt should work here if (action.mayBeInteractive()) { params.push_front("ui.interactive=true"); params.push_front("--config"); interactive = true; } else { params.push_front("--noninteractive"); } } #endif m_isRunning = true; setRange(0, 0); show(); m_output.clear(); m_realm = ""; m_userName = ""; if (!action.workingDir.isEmpty()) { m_proc->setWorkingDirectory(action.workingDir); } m_procInput = 0; m_ptySlaveFilename = ""; #ifndef Q_OS_WIN32 if (interactive) { char name[1024]; if (openpty(&m_ptyMasterFd, &m_ptySlaveFd, name, NULL, NULL)) { perror("openpty failed"); } else { DEBUG << "openpty succeeded: master " << m_ptyMasterFd << " slave " << m_ptySlaveFd << " filename " << name << endl; m_procInput = new QFile; m_procInput->open(m_ptyMasterFd, QFile::WriteOnly); m_ptySlaveFilename = name; m_proc->setStandardInputFile(m_ptySlaveFilename); ::close(m_ptySlaveFd); } } #endif QString cmdline = executable; foreach (QString param, params) cmdline += " " + param; DEBUG << "HgRunner: starting: " << cmdline << " with cwd " << action.workingDir << endl; m_currentAction = action; DEBUG << "set current action to " << m_currentAction.action << endl; m_proc->start(executable, params); } void HgRunner::closeProcInput() { DEBUG << "closeProcInput" << endl; m_proc->closeWriteChannel(); #ifndef Q_OS_WIN32 if (m_ptySlaveFilename != "") { ::close(m_ptyMasterFd); m_ptySlaveFilename = ""; } #endif }