| 修订版 | 29392 (tree) |
|---|---|
| 时间 | 2022-04-15 17:47:59 |
| 作者 | stefankueng |
don't clear visible revisions if set externally
trunk/src/Changelog.txt (diff)
trunk/src/TortoiseProc/LogDialog/LogDlgHelper.cpp (diff)
trunk/src/TortoiseProc/LogDialog/LogDlgHelper.h (diff)| @@ -1,4 +1,8 @@ | ||
| 1 | -Version 1.14.3 | |
| 1 | +Version 1.14.4 | |
| 2 | +- BUG: revisions entered in the merge dialog were | |
| 3 | + not selected anymore in the log dialog. (Stefan) | |
| 4 | + | |
| 5 | +Version 1.14.3 | |
| 2 | 6 | - BUG: clipboard wasn't closed after pasting into |
| 3 | 7 | the filter control in the log dialog. (Stefan) |
| 4 | 8 | - BUG: when merging via log dialog, a warning was falsely |
| @@ -26,14 +26,16 @@ | ||
| 26 | 26 | #include "SVNDataObject.h" |
| 27 | 27 | |
| 28 | 28 | CStoreSelection::CStoreSelection(CLogDlg* dlg) |
| 29 | + : m_logDlg(dlg) | |
| 30 | + , m_keepWhenAdding(false) | |
| 29 | 31 | { |
| 30 | - m_logDlg = dlg; | |
| 31 | 32 | AddSelections(); |
| 32 | 33 | } |
| 33 | 34 | |
| 34 | 35 | CStoreSelection::CStoreSelection(CLogDlg* dlg, const SVNRevRangeArray& revRange) |
| 36 | + : m_logDlg(dlg) | |
| 37 | + , m_keepWhenAdding(true) | |
| 35 | 38 | { |
| 36 | - m_logDlg = dlg; | |
| 37 | 39 | |
| 38 | 40 | for (int i = 0; i < revRange.GetCount(); ++i) |
| 39 | 41 | { |
| @@ -59,10 +61,13 @@ | ||
| 59 | 61 | { |
| 60 | 62 | int shownRows = static_cast<int>(m_logDlg->m_logEntries.GetVisibleCount()); |
| 61 | 63 | |
| 62 | - for (int i = 0, count = static_cast<int>(m_logDlg->m_logEntries.GetVisibleCount()); i < count; ++i) | |
| 64 | + if (!m_keepWhenAdding) | |
| 63 | 65 | { |
| 64 | - auto* pLogEntry = m_logDlg->m_logEntries.GetVisible(i); | |
| 65 | - m_setSelectedRevisions.erase(pLogEntry->GetRevision()); | |
| 66 | + for (int i = 0, count = static_cast<int>(m_logDlg->m_logEntries.GetVisibleCount()); i < count; ++i) | |
| 67 | + { | |
| 68 | + auto* pLogEntry = m_logDlg->m_logEntries.GetVisible(i); | |
| 69 | + m_setSelectedRevisions.erase(pLogEntry->GetRevision()); | |
| 70 | + } | |
| 66 | 71 | } |
| 67 | 72 | |
| 68 | 73 | POSITION pos = m_logDlg->m_logList.GetFirstSelectedItemPosition(); |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | // TortoiseSVN - a Windows shell extension for easy version control |
| 2 | 2 | |
| 3 | -// Copyright (C) 2003-2010, 2012,2013-2016, 2020-2021 - TortoiseSVN | |
| 3 | +// Copyright (C) 2003-2010, 2012,2013-2016, 2020-2022 - TortoiseSVN | |
| 4 | 4 | |
| 5 | 5 | // This program is free software; you can redistribute it and/or |
| 6 | 6 | // modify it under the terms of the GNU General Public License |
| @@ -40,6 +40,7 @@ | ||
| 40 | 40 | protected: |
| 41 | 41 | CLogDlg* m_logDlg; |
| 42 | 42 | std::set<long> m_setSelectedRevisions; |
| 43 | + bool m_keepWhenAdding; | |
| 43 | 44 | }; |
| 44 | 45 | |
| 45 | 46 | /** |
TortoiseSVN