Mercurial > hg > easyhg
comparison mainwindow.cpp @ 282:1ec306df738e
Merge
author | Chris Cannam |
---|---|
date | Fri, 18 Feb 2011 13:39:16 +0000 |
parents | 9162f14c5ab7 a98e76fa58f2 |
children | a68801b31ceb |
comparison
equal
deleted
inserted
replaced
281:9162f14c5ab7 | 282:1ec306df738e |
---|---|
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: |