Mercurial > hg > easyhg
comparison mainwindow.cpp @ 280:a98e76fa58f2
* Avoid reporting failure when hg incoming shows a warning (as is the case when site cert could not be verified)
author | Chris Cannam |
---|---|
date | Thu, 17 Feb 2011 12:10:09 +0000 |
parents | cc95394e2392 |
children | 1ec306df738e |
comparison
equal
deleted
inserted
replaced
279:cbfc1930289a | 280:a98e76fa58f2 |
---|---|
1693 enableDisableActions(); | 1693 enableDisableActions(); |
1694 break; | 1694 break; |
1695 case ACT_INCOMING: | 1695 case ACT_INCOMING: |
1696 // returns non-zero code and no output if the check was | 1696 // returns non-zero code and no output if the check was |
1697 // successful but there are no changes pending | 1697 // successful but there are no changes pending |
1698 if (output.trimmed() == "") { | 1698 if (output.replace(QRegExp("(^|\\n)warning: [^\\n]*\\n"), "").trimmed() == "") { |
1699 showIncoming(""); | 1699 showIncoming(""); |
1700 return; | 1700 return; |
1701 } | 1701 } |
1702 break; | 1702 break; |
1703 case ACT_QUERY_HEADS: | 1703 case ACT_QUERY_HEADS: |