• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision29392 (tree)
Time2022-04-15 17:47:59
Authorstefankueng

Log Message

don't clear visible revisions if set externally

Change Summary

Incremental Difference

--- trunk/src/Changelog.txt (revision 29391)
+++ trunk/src/Changelog.txt (revision 29392)
@@ -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
26 - BUG: clipboard wasn't closed after pasting into
37 the filter control in the log dialog. (Stefan)
48 - BUG: when merging via log dialog, a warning was falsely
--- trunk/src/TortoiseProc/LogDialog/LogDlgHelper.cpp (revision 29391)
+++ trunk/src/TortoiseProc/LogDialog/LogDlgHelper.cpp (revision 29392)
@@ -26,14 +26,16 @@
2626 #include "SVNDataObject.h"
2727
2828 CStoreSelection::CStoreSelection(CLogDlg* dlg)
29+ : m_logDlg(dlg)
30+ , m_keepWhenAdding(false)
2931 {
30- m_logDlg = dlg;
3132 AddSelections();
3233 }
3334
3435 CStoreSelection::CStoreSelection(CLogDlg* dlg, const SVNRevRangeArray& revRange)
36+ : m_logDlg(dlg)
37+ , m_keepWhenAdding(true)
3538 {
36- m_logDlg = dlg;
3739
3840 for (int i = 0; i < revRange.GetCount(); ++i)
3941 {
@@ -59,10 +61,13 @@
5961 {
6062 int shownRows = static_cast<int>(m_logDlg->m_logEntries.GetVisibleCount());
6163
62- for (int i = 0, count = static_cast<int>(m_logDlg->m_logEntries.GetVisibleCount()); i < count; ++i)
64+ if (!m_keepWhenAdding)
6365 {
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+ }
6671 }
6772
6873 POSITION pos = m_logDlg->m_logList.GetFirstSelectedItemPosition();
--- trunk/src/TortoiseProc/LogDialog/LogDlgHelper.h (revision 29391)
+++ trunk/src/TortoiseProc/LogDialog/LogDlgHelper.h (revision 29392)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2010, 2012,2013-2016, 2020-2021 - TortoiseSVN
3+// Copyright (C) 2003-2010, 2012,2013-2016, 2020-2022 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -40,6 +40,7 @@
4040 protected:
4141 CLogDlg* m_logDlg;
4242 std::set<long> m_setSelectedRevisions;
43+ bool m_keepWhenAdding;
4344 };
4445
4546 /**
Show on old repository browser