Mercurial > hg > easyhg
comparison mainwindow.cpp @ 211:290a95b5ceae
* Report error if hg incoming does authentically fail (e.g. because remote repo is unavailable or unrelated)
* Change target executable name from easyhg to EasyMercurial
* Some (probably invisible) layout tweaks
author | Chris Cannam |
---|---|
date | Wed, 05 Jan 2011 15:05:45 +0000 |
parents | c5fceb3fe5b4 |
children | 4c5993d860f3 |
comparison
equal
deleted
inserted
replaced
210:c5fceb3fe5b4 | 211:290a95b5ceae |
---|---|
1547 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 “Use EasyHg Mercurial Extension” 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:")), | 1547 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 “Use EasyHg Mercurial Extension” 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:")), |
1548 output)); | 1548 output)); |
1549 settings(); | 1549 settings(); |
1550 return; | 1550 return; |
1551 case ACT_INCOMING: | 1551 case ACT_INCOMING: |
1552 // returns non-zero code if the check was successful but there | 1552 // returns non-zero code and no output if the check was |
1553 // are no changes pending | 1553 // successful but there are no changes pending |
1554 if (output.trimmed() == "") showIncoming(""); | 1554 if (output.trimmed() == "") { |
1555 return; | 1555 showIncoming(""); |
1556 return; | |
1557 } | |
1558 break; | |
1556 case ACT_QUERY_HEADS: | 1559 case ACT_QUERY_HEADS: |
1557 // fails if repo is empty; we don't care (if there's a genuine | 1560 // fails if repo is empty; we don't care (if there's a genuine |
1558 // problem, something else will fail too). Pretend it | 1561 // problem, something else will fail too). Pretend it |
1559 // succeeded, so that any further actions that are contingent | 1562 // succeeded, so that any further actions that are contingent |
1560 // on the success of the heads query get carried out properly. | 1563 // on the success of the heads query get carried out properly. |