Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make CommitList display "Working tree clean" #708

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make CommitList display "Working tree clean" #708

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions src/ui/CommitList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,17 @@ class CommitModel : public QAbstractListModel {
resetWalker();
}

bool is_working_tree_clean(void) const {
if (mStatus.isRunning()) {
return false;
}
git::Diff stat = status();
if (!stat.isValid()) {
return true;
}
return stat.count() == 0;
}

void suppressResetWalker(bool suppress) { mSuppressResetWalker = suppress; }

bool isResetWalkerSuppressed() { return mSuppressResetWalker; }
Expand Down Expand Up @@ -186,8 +197,8 @@ class CommitModel : public QAbstractListModel {

// Update status row.
bool head = (!mRef.isValid() || mRef.isHead());
bool valid = (!mStatus.isFinished() || status().isValid());
if (mShowCleanStatus && head && valid && mPathspec.isEmpty()) {
if (mShowCleanStatus && head && mStatus.isFinished() &&
mPathspec.isEmpty()) {
QVector<Column> row;
if (mGraphVisible && mRef.isValid() && mStatus.isFinished()) {
row.append({Segment(Bottom, kTaintedColor), Segment(Dot, QColor())});
Expand Down Expand Up @@ -322,17 +333,19 @@ class CommitModel : public QAbstractListModel {

QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const {
const Row &row = mRows.at(index.row());
bool status = !row.commit.isValid();
bool commit_is_valid = row.commit.isValid();

switch (role) {
case Qt::DisplayRole:
if (!status)
if (commit_is_valid)
return QVariant();

return mStatus.isFinished() ? tr("Uncommitted changes")
: tr("Checking for uncommitted changes");
if (!mStatus.isFinished())
return tr("Checking for uncommitted changes");
return is_working_tree_clean() ? tr("Working tree clean")
: tr("Uncommitted changes");

case Qt::FontRole: {
if (!status)
if (commit_is_valid)
return QVariant();

QFont font = static_cast<QWidget *>(QObject::parent())->font();
Expand All @@ -341,19 +354,19 @@ class CommitModel : public QAbstractListModel {
}

case Qt::TextAlignmentRole:
if (!status)
if (commit_is_valid)
return QVariant();

return QVariant(Qt::AlignHCenter | Qt::AlignVCenter);

case Qt::DecorationRole:
if (!status)
if (commit_is_valid)
return QVariant();

return mStatus.isFinished() ? QVariant() : mProgress;

case CommitList::Role::DiffRole: {
if (status)
if (!commit_is_valid)
return QVariant::fromValue(this->status());

bool ignoreWhitespace = Settings::instance()->isWhitespaceIgnored();
Expand All @@ -363,7 +376,7 @@ class CommitModel : public QAbstractListModel {
}

case CommitList::Role::CommitRole:
return status ? QVariant() : QVariant::fromValue(row.commit);
return commit_is_valid ? QVariant::fromValue(row.commit) : QVariant();

case CommitList::Role::GraphRole: {
QVariantList columns;
Expand Down
Loading