diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-10-19 16:44:25 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-10-21 09:49:08 +0000 |
| commit | 8224c1c95df481ad34fad3f699e67db42bc8b6ea (patch) | |
| tree | 408d3f25fa59cd4e8508a51fdb8213e9a4cebeac /src/plugins/diffeditor/diffeditordocument.cpp | |
| parent | 344f255fa9e0defd1613a2692075f2423b560aad (diff) | |
| download | qt-creator-8224c1c95df481ad34fad3f699e67db42bc8b6ea.tar.gz | |
DiffEditor: fix revert chunk for diffs of modified files
Apply chunk action doesn't make sense for that case,
will stay disabled.
Task-number: QTCREATORBUG-17136
Change-Id: Idce31b3aa9d354536a01607c10b20273158961d5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/diffeditor/diffeditordocument.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditordocument.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 5102df44d9..5a4d575d9c 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -87,7 +87,9 @@ DiffEditorController *DiffEditorDocument::controller() const return m_controller; } -QString DiffEditorDocument::makePatch(int fileIndex, int chunkIndex, bool revert, bool addPrefix) const +QString DiffEditorDocument::makePatch(int fileIndex, int chunkIndex, + bool revert, bool addPrefix, + const QString &overriddenFileName) const { if (fileIndex < 0 || chunkIndex < 0) return QString(); @@ -102,9 +104,10 @@ QString DiffEditorDocument::makePatch(int fileIndex, int chunkIndex, bool revert const ChunkData &chunkData = fileData.chunks.at(chunkIndex); const bool lastChunk = (chunkIndex == fileData.chunks.count() - 1); - const QString fileName = revert - ? fileData.rightFileInfo.fileName - : fileData.leftFileInfo.fileName; + const QString fileName = !overriddenFileName.isEmpty() + ? overriddenFileName : revert + ? fileData.rightFileInfo.fileName + : fileData.leftFileInfo.fileName; QString leftPrefix, rightPrefix; if (addPrefix) { |