feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Place conflicted files last in submit editor

Browse Source 
Change-Id: Ie4c7423d85f3f568d04d6c86e8b8123c73dab5fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-25 10:00:28 +02:00
parent a570e7327f
commit aed53a70ee
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/commitdata.cpp
View File

@@ -108,6 +108,15 @@ static FileStates stateFor(const QChar &c)
} }
} }
bool operator<(const CommitData::StateFilePair &a, const CommitData::StateFilePair &b)
{
if ((a.first & UnmergedFile) && !(b.first & UnmergedFile))
return false;
if ((b.first & UnmergedFile) && !(a.first & UnmergedFile))
return true;
return a.second < b.second;
}
bool CommitData::checkLine(const QString &stateInfo, const QString &file) bool CommitData::checkLine(const QString &stateInfo, const QString &file)
{ {
QTC_ASSERT(stateInfo.count() == 2, return false); QTC_ASSERT(stateInfo.count() == 2, return false);
@@ -147,6 +156,7 @@ bool CommitData::checkLine(const QString &stateInfo, const QString &file)
files.append(qMakePair(yState, newFile)); files.append(qMakePair(yState, newFile));
} }
} }
qSort(files);
return true; return true;
} }

2
src/plugins/git/commitdata.h
View File

@@ -109,6 +109,8 @@ private:
bool checkLine(const QString &stateInfo, const QString &file); bool checkLine(const QString &stateInfo, const QString &file);
}; };
bool operator<(const CommitData::StateFilePair &a, const CommitData::StateFilePair &b);
} // namespace Internal } // namespace Internal
} // namespace Git } // namespace Git