Mercurial > hg > easyhg
diff hgrunner.cpp @ 128:fcaf09ee825d
* Show tags and current working copy parents in history graph
author | Chris Cannam |
---|---|
date | Mon, 29 Nov 2010 20:09:58 +0000 |
parents | 1f27f71a7034 |
children | 0ad212075b36 |
line wrap: on
line diff
--- a/hgrunner.cpp Mon Nov 29 17:48:43 2010 +0000 +++ b/hgrunner.cpp Mon Nov 29 20:09:58 2010 +0000 @@ -176,19 +176,21 @@ { //DEBUG << "checkPrompts: " << chunk << endl; + if (!m_currentAction.mayBeInteractive()) return false; + QString text = chunk.trimmed(); QString lower = text.toLower(); if (lower.endsWith("password:")) { getPassword(); return true; } - if (lower.endsWith("user:")) { + if (lower.endsWith("user:") || lower.endsWith("username:")) { getUsername(); return true; } - QRegExp userRe("\\buser:\\s*([^\\s]+)"); + QRegExp userRe("\\buser(name)?:\\s*([^\\s]+)"); if (userRe.indexIn(text) >= 0) { - noteUsername(userRe.cap(1)); + noteUsername(userRe.cap(2)); } QRegExp realmRe("\\brealmr:\\s*([^\\s]+)"); if (realmRe.indexIn(text) >= 0) {