comparison mainwindow.cpp @ 252:669f2a8ff1a8

* Handle clone failure more gracefully
author Chris Cannam
date Wed, 12 Jan 2011 12:47:56 +0000
parents 123e06d5d9af
children 8730dd806cca
comparison
equal deleted inserted replaced
250:be483734bde5 252:669f2a8ff1a8
1682 format3(tr("Failed to run Mercurial with extension enabled"), 1682 format3(tr("Failed to run Mercurial with extension enabled"),
1683 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem with EasyMercurial.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication may not work if you do this.<br><br>%2").arg(setstr).arg(output == "" ? QString("") : tr("The test command said:")), 1683 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem with EasyMercurial.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication may not work if you do this.<br><br>%2").arg(setstr).arg(output == "" ? QString("") : tr("The test command said:")),
1684 output)); 1684 output));
1685 settings(); 1685 settings();
1686 return; 1686 return;
1687 case ACT_CLONEFROMREMOTE:
1688 // if clone fails, we have no repo
1689 workFolderPath = "";
1690 enableDisableActions();
1691 break;
1687 case ACT_INCOMING: 1692 case ACT_INCOMING:
1688 // returns non-zero code and no output if the check was 1693 // returns non-zero code and no output if the check was
1689 // successful but there are no changes pending 1694 // successful but there are no changes pending
1690 if (output.trimmed() == "") { 1695 if (output.trimmed() == "") {
1691 showIncoming(""); 1696 showIncoming("");