Mercurial > hg > easyhg
comparison hgtabwidget.cpp @ 172:b6dd1ee0e486
* Fix failure to recognise local uncommitted changes when an untracked file was selected
* Win32: Look in installed location (currently just the location of the present .exe) for executables as well as in path
* Win32: Search for easyhg extension in same way as executables
* Win32: Set installed location to path when running hg commands (for dependent DLLs)
author | Chris Cannam |
---|---|
date | Wed, 15 Dec 2010 22:07:31 +0000 |
parents | 4bad3c5c053a |
children | f16fe0db11f3 |
comparison
equal
deleted
inserted
replaced
171:aab308a3b304 | 172:b6dd1ee0e486 |
---|---|
79 m_fileStatusWidget->clearSelections(); | 79 m_fileStatusWidget->clearSelections(); |
80 } | 80 } |
81 | 81 |
82 void HgTabWidget::setCurrent(QStringList ids, QString branch) | 82 void HgTabWidget::setCurrent(QStringList ids, QString branch) |
83 { | 83 { |
84 bool showUncommitted = false; | 84 bool showUncommitted = haveChangesToCommit(); |
85 if (canRevert()) showUncommitted = true; | |
86 m_historyWidget->setCurrent(ids, branch, showUncommitted); | 85 m_historyWidget->setCurrent(ids, branch, showUncommitted); |
87 } | 86 } |
88 | 87 |
89 void HgTabWidget::updateHistory() | 88 void HgTabWidget::updateHistory() |
90 { | 89 { |
130 bool HgTabWidget::canResolve() const | 129 bool HgTabWidget::canResolve() const |
131 { | 130 { |
132 return !m_fileStatusWidget->getSelectedUnresolvedFiles().empty(); | 131 return !m_fileStatusWidget->getSelectedUnresolvedFiles().empty(); |
133 } | 132 } |
134 | 133 |
134 bool HgTabWidget::haveChangesToCommit() const | |
135 { | |
136 return m_fileStatusWidget->haveChangesToCommit(); | |
137 } | |
138 | |
135 QStringList HgTabWidget::getAllSelectedFiles() const | 139 QStringList HgTabWidget::getAllSelectedFiles() const |
136 { | 140 { |
137 return m_fileStatusWidget->getAllSelectedFiles(); | 141 return m_fileStatusWidget->getAllSelectedFiles(); |
138 } | 142 } |
139 | 143 |