comparison mainwindow.cpp @ 173:a6d336837ebe

* Add (examining repository) message for initial state * Reduce panner glitches when dragging * Clear merge commit comment after use
author Chris Cannam
date Thu, 16 Dec 2010 12:03:09 +0000
parents b6dd1ee0e486
children 4dc802a4d5ae
comparison
equal deleted inserted replaced
172:b6dd1ee0e486 173:a6d336837ebe
320 params << "commit" << "--message" << comment 320 params << "commit" << "--message" << comment
321 << "--user" << getUserInfo(); 321 << "--user" << getUserInfo();
322 } 322 }
323 323
324 runner->requestAction(HgAction(ACT_COMMIT, workFolderPath, params)); 324 runner->requestAction(HgAction(ACT_COMMIT, workFolderPath, params));
325 mergeCommitComment = "";
325 } 326 }
326 } 327 }
327 328
328 QString MainWindow::filterTag(QString tag) 329 QString MainWindow::filterTag(QString tag)
329 { 330 {
767 currentBranch = ""; 768 currentBranch = "";
768 lastStatOutput = ""; 769 lastStatOutput = "";
769 lastRevertedFiles.clear(); 770 lastRevertedFiles.clear();
770 mergeTargetRevision = ""; 771 mergeTargetRevision = "";
771 mergeCommitComment = ""; 772 mergeCommitComment = "";
773 stateUnknown = true;
772 needNewLog = true; 774 needNewLog = true;
773 } 775 }
774 776
775 void MainWindow::hgServe() 777 void MainWindow::hgServe()
776 { 778 {
1542 } 1544 }
1543 break; 1545 break;
1544 } 1546 }
1545 1547
1546 if (noMore) { 1548 if (noMore) {
1549 stateUnknown = false;
1547 enableDisableActions(); 1550 enableDisableActions();
1548 hgTabs->updateHistory(); 1551 hgTabs->updateHistory();
1549 } 1552 }
1550 } 1553 }
1551 1554
1725 branchText = tr("the default branch"); 1728 branchText = tr("the default branch");
1726 } else { 1729 } else {
1727 branchText = tr("branch \"%1\"").arg(currentBranch); 1730 branchText = tr("branch \"%1\"").arg(currentBranch);
1728 } 1731 }
1729 1732
1730 if (emptyRepo) { 1733 if (stateUnknown) {
1734 hgTabs->setState(tr("(Examining repository)"));
1735 } else if (emptyRepo) {
1731 hgTabs->setState(tr("Nothing committed to this repository yet")); 1736 hgTabs->setState(tr("Nothing committed to this repository yet"));
1732 } else if (canMerge) { 1737 } else if (canMerge) {
1733 hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText)); 1738 hgTabs->setState(tr("<b>Awaiting merge</b> on %1").arg(branchText));
1734 } else if (!hgTabs->getAllUnresolvedFiles().empty()) { 1739 } else if (!hgTabs->getAllUnresolvedFiles().empty()) {
1735 hgTabs->setState(tr("Have unresolved files following merge on %1").arg(branchText)); 1740 hgTabs->setState(tr("Have unresolved files following merge on %1").arg(branchText));