• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28671 (tree)
Time2019-10-24 02:19:04
Authorstefankueng

Log Message

Remember the state of the "ignore whitespaces" radio button in the blame dialog.

Change Summary

Incremental Difference

--- trunk/src/TortoiseProc/BlameDlg.cpp (revision 28670)
+++ trunk/src/TortoiseProc/BlameDlg.cpp (revision 28671)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2012, 2014-2015 - TortoiseSVN
3+// Copyright (C) 2003-2012, 2014-2015, 2019 - 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
@@ -37,6 +37,8 @@
3737 m_bTextView = m_regTextView;
3838 m_regIncludeMerge = CRegDWORD(L"Software\\TortoiseSVN\\BlameIncludeMerge", FALSE);
3939 m_bIncludeMerge = m_regIncludeMerge;
40+ m_regIgnoreWhitespace = CRegDWORD(L"Software\\TortoiseSVN\\BlameIgnoreWhitespace", svn_diff_file_ignore_space_none);
41+ m_IgnoreSpaces = (svn_diff_file_ignore_space_t)(DWORD)m_regIgnoreWhitespace;
4042 }
4143
4244 CBlameDlg::~CBlameDlg()
@@ -84,6 +86,7 @@
8486
8587 m_bTextView = m_regTextView;
8688 m_bIncludeMerge = m_regIncludeMerge;
89+ m_IgnoreSpaces = (svn_diff_file_ignore_space_t)(DWORD)m_regIgnoreWhitespace;
8790 // set head revision as default revision
8891 if (EndRev.IsHead())
8992 CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_HEAD);
@@ -95,6 +98,19 @@
9598 }
9699
97100 CheckRadioButton(IDC_COMPAREWHITESPACES, IDC_IGNOREALLWHITESPACES, IDC_IGNOREALLWHITESPACES);
101+ switch (m_IgnoreSpaces)
102+ {
103+ case svn_diff_file_ignore_space_change:
104+ CheckRadioButton(IDC_COMPAREWHITESPACES, IDC_IGNOREALLWHITESPACES, IDC_IGNOREWHITESPACECHANGES);
105+ break;
106+ case svn_diff_file_ignore_space_all:
107+ CheckRadioButton(IDC_COMPAREWHITESPACES, IDC_IGNOREALLWHITESPACES, IDC_IGNOREALLWHITESPACES);
108+ break;
109+ case svn_diff_file_ignore_space_none:
110+ default:
111+ CheckRadioButton(IDC_COMPAREWHITESPACES, IDC_IGNOREALLWHITESPACES, IDC_COMPAREWHITESPACES);
112+ break;
113+ }
98114
99115 if ((m_pParentWnd==NULL)&&(GetExplorerHWND()))
100116 CenterWindow(CWnd::FromHandle(GetExplorerHWND()));
@@ -146,6 +162,8 @@
146162 break;
147163 }
148164
165+ m_regIgnoreWhitespace = m_IgnoreSpaces;
166+
149167 UpdateData(FALSE);
150168
151169 CStateStandAloneDialog::OnOK();
--- trunk/src/TortoiseProc/BlameDlg.h (revision 28670)
+++ trunk/src/TortoiseProc/BlameDlg.h (revision 28671)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2012, 2015 - TortoiseSVN
3+// Copyright (C) 2003-2012, 2015, 2019 - 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
@@ -52,6 +52,7 @@
5252 CString m_sEndRev;
5353 CRegDWORD m_regTextView;
5454 CRegDWORD m_regIncludeMerge;
55+ CRegDWORD m_regIgnoreWhitespace;
5556
5657 public:
5758 SVNRev StartRev;
Show on old repository browser