Show file conflicts and prevent to commit.

francescmm · Dec 14, 2019 · 32d1fa2 · 32d1fa2
1 parent c90cbee
commit 32d1fa2
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 30 deletions.
diff --git a/app/UnstagedFilesContextMenu.cpp b/app/UnstagedFilesContextMenu.cpp
@@ -7,49 +7,62 @@
 #include <QDir>
 #include <QMessageBox>
 
-UnstagedFilesContextMenu::UnstagedFilesContextMenu(QSharedPointer<Git> git, const QString &fileName, QWidget *parent)
+UnstagedFilesContextMenu::UnstagedFilesContextMenu(QSharedPointer<Git> git, const QString &fileName, bool hasConflicts,
+                                                   QWidget *parent)
    : QMenu(parent)
    , mGit(git)
    , mFileName(fileName)
 {
-   connect(addAction("See changes"), &QAction::triggered, this, [this]() { emit signalShowDiff(mFileName); });
+   connect(addAction("See changes"), &QAction::triggered, this, &UnstagedFilesContextMenu::signalShowDiff);
 
    addSeparator();
 
-   connect(addAction("Revert file changes"), &QAction::triggered, this, [this, fileName]() {
+   if (hasConflicts)
+   {
+      connect(addAction("Mark as resolved"), &QAction::triggered, this, [this] {
+         const auto ret = mGit->markFileAsResolved(mFileName);
+
+         if (ret.success)
+            emit signalConflictsResolved();
+      });
+
+      addSeparator();
+   }
+
+   connect(addAction("Revert file changes"), &QAction::triggered, this, [this]() {
       const auto msgBoxRet
           = QMessageBox::question(this, tr("Ignoring file"), tr("Are you sure you want to revert the changes?"));
 
       if (msgBoxRet == QMessageBox::Yes)
       {
-         const auto ret = mGit->resetFile(fileName);
+         const auto ret = mGit->resetFile(mFileName);
 
          emit signalCheckedOut(ret);
       }
    });
 
-   connect(addAction("Blame"), &QAction::triggered, this, [this]() { emit signalShowFileHistory(mFileName); });
+   connect(addAction("Blame"), &QAction::triggered, this, &UnstagedFilesContextMenu::signalShowFileHistory);
 
-   connect(addAction("Ignore file name"), &QAction::triggered, this, [this, fileName]() {
+   connect(addAction("Ignore file"), &QAction::triggered, this, [this]() {
       const auto ret = QMessageBox::question(this, tr("Ignoring file"),
                                              tr("Are you sure you want to add the file to the black list?"));
 
       if (ret == QMessageBox::Yes)
       {
-         const auto gitRet = addEntryToGitIgnore(fileName);
+         const auto gitRet = addEntryToGitIgnore(mFileName);
 
          if (gitRet)
             emit signalCheckedOut(gitRet);
       }
    });
 
-   connect(addAction("Ignore file extension"), &QAction::triggered, this, [this, fileName]() {
+   connect(addAction("Ignore extension"), &QAction::triggered, this, [this]() {
       const auto msgBoxRet = QMessageBox::question(this, tr("Ignoring file"),
                                                    tr("Are you sure you want to add the file to the black list?"));
 
       if (msgBoxRet == QMessageBox::Yes)
       {
-         auto fileParts = fileName.split(".");
+         auto fileParts = mFileName.split(".");
          fileParts.takeFirst();
          const auto extension = QString("*.%1").arg(fileParts.join("."));
          const auto ret = addEntryToGitIgnore(extension);
@@ -59,14 +72,16 @@ UnstagedFilesContextMenu::UnstagedFilesContextMenu(QSharedPointer<Git> git, cons
       }
    });
 
+   /*
    QAction *removeAction = nullptr;
    connect(removeAction = addAction("Remove file"), &QAction::triggered, this, []() {});
    removeAction->setDisabled(true);
+   */
 
    addSeparator();
 
    connect(addAction("Add all files to commit"), &QAction::triggered, this, &UnstagedFilesContextMenu::signalCommitAll);
-   connect(addAction("Revert all changes"), &QAction::triggered, this, [this, fileName]() {
+   connect(addAction("Revert all changes"), &QAction::triggered, this, [this]() {
       const auto msgBoxRet = QMessageBox::question(this, tr("Ignoring file"),
                                                    tr("Are you sure you want to add the file to the black list?"));
       if (msgBoxRet == QMessageBox::Yes)

diff --git a/app/UnstagedFilesContextMenu.h b/app/UnstagedFilesContextMenu.h
@@ -32,14 +32,16 @@ class UnstagedFilesContextMenu : public QMenu
    Q_OBJECT
 
 signals:
-   void signalShowDiff(const QString &fileName);
+   void signalShowDiff();
    void signalCommitAll();
    void signalRevertAll();
    void signalCheckedOut(bool success);
-   void signalShowFileHistory(const QString &fileName);
+   void signalShowFileHistory();
+   void signalConflictsResolved();
 
 public:
-   explicit UnstagedFilesContextMenu(QSharedPointer<Git> git, const QString &fileName, QWidget *parent = nullptr);
+   explicit UnstagedFilesContextMenu(QSharedPointer<Git> git, const QString &fileName, bool hasConflicts,
+                                     QWidget *parent = nullptr);
 
 private:
    QSharedPointer<Git> mGit;

diff --git a/app/WorkInProgressWidget.cpp b/app/WorkInProgressWidget.cpp
@@ -72,6 +72,12 @@ void WorkInProgressWidget::configure(const QString &sha)
 {
    const auto shaChange = mCurrentSha != sha;
    mCurrentSha = sha;
+
+   resetInfo(shaChange);
+}
+
+void WorkInProgressWidget::resetInfo(bool force)
+{
    mIsAmend = mCurrentSha != ZERO_SHA;
 
    QLog_Info("UI",
@@ -106,12 +112,12 @@ void WorkInProgressWidget::configure(const QString &sha)
 
    const auto files = mGit->getWipFiles();
 
-   if (!shaChange || (mIsAmend && shaChange))
+   if (!force || (mIsAmend && force))
       prepareCache();
 
    insertFilesInList(files, ui->unstagedFilesList);
 
-   if (!shaChange || (mIsAmend && shaChange))
+   if (!force || (mIsAmend && force))
       clearCache();
 
    if (mIsAmend)
@@ -135,13 +141,13 @@ void WorkInProgressWidget::configure(const QString &sha)
 
       msg = logMessage.second.trimmed();
 
-      if (mIsAmend || shaChange)
+      if (mIsAmend || force)
          ui->leCommitTitle->setText(logMessage.first);
    }
    else
       msg = lastMsgBeforeError;
 
-   if (mIsAmend || shaChange)
+   if (mIsAmend || force)
    {
       ui->teDescription->setPlainText(msg);
       ui->teDescription->moveCursor(QTextCursor::Start);
@@ -309,15 +315,23 @@ void WorkInProgressWidget::showUnstagedMenu(const QPoint &pos)
    if (item)
    {
       const auto fileName = item->toolTip();
-      const auto contextMenu = new UnstagedFilesContextMenu(mGit, fileName, this);
-      connect(contextMenu, &UnstagedFilesContextMenu::signalShowDiff, this, &WorkInProgressWidget::signalShowDiff);
+      const auto unsolvedConflicts = item->data(Qt::UserRole + 1).toBool();
+      const auto contextMenu = new UnstagedFilesContextMenu(mGit, fileName, unsolvedConflicts, this);
+      connect(contextMenu, &UnstagedFilesContextMenu::signalShowDiff, this,
+              [this, fileName]() { signalShowDiff(fileName); });
       connect(contextMenu, &UnstagedFilesContextMenu::signalCommitAll, this,
               &WorkInProgressWidget::addAllFilesToCommitList);
       connect(contextMenu, &UnstagedFilesContextMenu::signalRevertAll, this, &WorkInProgressWidget::revertAllChanges);
       connect(contextMenu, &UnstagedFilesContextMenu::signalCheckedOut, this,
               &WorkInProgressWidget::signalCheckoutPerformed);
       connect(contextMenu, &UnstagedFilesContextMenu::signalShowFileHistory, this,
-              &WorkInProgressWidget::signalShowFileHistory);
+              [this, fileName]() { emit signalShowFileHistory(fileName); });
+      connect(contextMenu, &UnstagedFilesContextMenu::signalConflictsResolved, this, [this, item] {
+         item->setData(Qt::UserRole + 1, false);
+         item->setText(item->text().remove("(conflicts)").trimmed());
+         item->setForeground(GitQlientStyles::getGreen());
+         resetInfo();
+      });
 
       const auto parentPos = ui->unstagedFilesList->mapToParent(pos);
       contextMenu->popup(mapToGlobal(parentPos));
@@ -414,26 +428,45 @@ void WorkInProgressWidget::updateCounter(const QString &text)
    ui->lCounter->setText(QString::number(kMaxTitleChars - text.count()));
 }
 
+bool WorkInProgressWidget::hasConflicts()
+{
+   const auto files = mCurrentFilesCache.values();
+
+   for (const auto &pair : files)
+   {
+      if (pair.second->data(Qt::UserRole + 1).toBool())
+         return true;
+   }
+
+   return false;
+}
+
 bool WorkInProgressWidget::commitChanges()
 {
    QString msg;
    QStringList selFiles = getFiles();
    auto done = false;
 
-   if (!selFiles.isEmpty() && checkMsg(msg))
+   if (!selFiles.isEmpty())
    {
-      QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-      const auto ok = mGit->commitFiles(selFiles, msg, false);
-      QApplication::restoreOverrideCursor();
+      if (hasConflicts())
+         QMessageBox::warning(this, tr("Impossible to commit"),
+                              tr("There are files with conflicts. Please, resolve the conflicts first."));
+      else if (checkMsg(msg))
+      {
+         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+         const auto ok = mGit->commitFiles(selFiles, msg, false);
+         QApplication::restoreOverrideCursor();
 
-      lastMsgBeforeError = (ok ? "" : msg);
+         lastMsgBeforeError = (ok ? "" : msg);
 
-      emit signalChangesCommitted(ok);
+         emit signalChangesCommitted(ok);
 
-      done = true;
+         done = true;
 
-      ui->leCommitTitle->clear();
-      ui->teDescription->clear();
+         ui->leCommitTitle->clear();
+         ui->teDescription->clear();
+      }
    }
 
    return done;
@@ -448,7 +481,10 @@ bool WorkInProgressWidget::amendChanges()
    {
       QString msg;
 
-      if (checkMsg(msg))
+      if (hasConflicts())
+         QMessageBox::warning(this, tr("Impossible to commit"),
+                              tr("There are files with conflicts. Please, resolve the conflicts first."));
+      else if (checkMsg(msg))
       {
          const auto author = QString("%1<%2>").arg(ui->leAuthorName->text(), ui->leAuthorEmail->text());
 

diff --git a/app/WorkInProgressWidget.h b/app/WorkInProgressWidget.h
@@ -76,6 +76,8 @@ class WorkInProgressWidget : public QWidget
    QStringList getFiles();
    bool checkMsg(QString &msg);
    void updateCounter(const QString &text);
+   bool hasConflicts();
+   void resetInfo(bool force = true);
 
    static QString lastMsgBeforeError;
    static const int kMaxTitleChars;

diff --git a/app/git.cpp b/app/git.cpp
@@ -352,6 +352,16 @@ GitExecResult Git::checkoutCommit(const QString &sha)
    return run(QString("git checkout %1").arg(sha));
 }
 
+GitExecResult Git::markFileAsResolved(const QString &fileName)
+{
+   const auto ret = run(QString("git add %1").arg(fileName));
+
+   if (ret.first)
+      updateWipRevision();
+
+   return ret;
+}
+
 GitExecResult Git::merge(const QString &into, QStringList sources)
 {
    const auto ret = run(QString("git checkout -q %1").arg(into));

diff --git a/app/git.h b/app/git.h
@@ -131,6 +131,7 @@ class Git : public QObject
    bool resetCommit(const QString &sha, CommitResetType type);
    bool resetCommits(int parentDepth);
    GitExecResult checkoutCommit(const QString &sha);
+   GitExecResult markFileAsResolved(const QString &fileName);
    /* END COMMIT WORK */
 
    /* START COMMIT INFO */