• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28400 (tree)
Time2018-10-12 02:47:54
Authorstefankueng

Log Message

Fix diffing by adding the missing 'prettypring' parameter.
Strange that there was no compiler warning...

Change Summary

Incremental Difference

--- trunk/src/TortoiseProc/Commands/DiffCommand.cpp (revision 28399)
+++ trunk/src/TortoiseProc/Commands/DiffCommand.cpp (revision 28400)
@@ -46,7 +46,7 @@
4646 CString diffoptions;
4747 if (parser.HasVal(L"diffoptions"))
4848 diffoptions = parser.GetVal(L"diffoptions");
49- bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, pegRevision, ignoreprops, diffoptions, false, bBlame);
49+ bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, pegRevision, ignoreprops, false, diffoptions, false, bBlame);
5050 }
5151 else
5252 {
--- trunk/src/TortoiseProc/Commands/PrevDiffCommand.cpp (revision 28399)
+++ trunk/src/TortoiseProc/Commands/PrevDiffCommand.cpp (revision 28400)
@@ -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) 2007-2011, 2013-2014 - TortoiseSVN
3+// Copyright (C) 2007-2011, 2013-2014, 2018 - 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
@@ -44,7 +44,7 @@
4444 if (st.status && st.status->changed_rev)
4545 {
4646 bool ignoreprops = !!parser.HasKey(L"ignoreprops");
47- bRet = diff.ShowCompare(cmdLinePath, SVNRev::REV_WC, cmdLinePath, st.status->changed_rev - 1, st.status->changed_rev, ignoreprops, L"", false, false, st.status->kind);
47+ bRet = diff.ShowCompare(cmdLinePath, SVNRev::REV_WC, cmdLinePath, st.status->changed_rev - 1, st.status->changed_rev, ignoreprops, false, L"", false, false, st.status->kind);
4848 }
4949 else
5050 {
--- trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28399)
+++ trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28400)
@@ -2757,7 +2757,7 @@
27572757 SVNDiff diff(this, m_hWnd, true);
27582758 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
27592759 diff.SetHEADPeg(m_LogRevision);
2760- diff.ShowCompare(path, rev2, path, rev1, SVNRev(), false, L"", false, false, nodekind);
2760+ diff.ShowCompare(path, rev2, path, rev1, SVNRev(), false, false, L"", false, false, nodekind);
27612761 }
27622762 else
27632763 {
@@ -2840,7 +2840,7 @@
28402840 else
28412841 {
28422842 diff.ShowCompare(CTSVNPath(secondfile), rev2, CTSVNPath(firstfile), rev1, SVNRev(),
2843- ignoreprops, L"", false, blame, nodekind);
2843+ ignoreprops, false, L"", false, blame, nodekind);
28442844 }
28452845 EnableOKButton();
28462846 }
@@ -5807,7 +5807,7 @@
58075807
58085808 SVNDiff diff(this, this->m_hWnd, true);
58095809 diff.SetHEADPeg(m_LogRevision);
5810- diff.ShowCompare(m_path, SVNRev::REV_BASE, m_path, pCmi->RevSelected, SVNRev(), false, L"", false, true);
5810+ diff.ShowCompare(m_path, SVNRev::REV_BASE, m_path, pCmi->RevSelected, SVNRev(), false, true, L"", false, true);
58115811 };
58125812 new async::CAsyncCall(f, &netScheduler);
58135813 }
@@ -5814,7 +5814,7 @@
58145814 else
58155815 {
58165816 CAppUtils::StartShowCompare(m_hWnd, m_path, SVNRev::REV_BASE, m_path,
5817- pCmi->RevSelected, SVNRev(), m_LogRevision, false, L"", false, false, true);
5817+ pCmi->RevSelected, SVNRev(), m_LogRevision, false, true, L"", false, false, true);
58185818 }
58195819 }
58205820
@@ -5838,7 +5838,7 @@
58385838 diff.SetHEADPeg(m_LogRevision);
58395839 diff.ShowCompare(CTSVNPath(pCmi->PathURL), pCmi->RevSelected2,
58405840 CTSVNPath(pCmi->PathURL), pCmi->RevSelected, SVNRev(),
5841- false, L"", false, true, nodekind);
5841+ false, true, L"", false, true, nodekind);
58425842 };
58435843 new async::CAsyncCall(f, &netScheduler);
58445844 }
@@ -5846,7 +5846,7 @@
58465846 {
58475847 CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pCmi->PathURL),
58485848 pCmi->RevSelected2, CTSVNPath(pCmi->PathURL), pCmi->RevSelected,
5849- SVNRev(), m_LogRevision, false, L"", false, false, true, nodekind);
5849+ SVNRev(), m_LogRevision, false, true, L"", false, false, true, nodekind);
58505850 }
58515851 }
58525852
@@ -5868,7 +5868,7 @@
58685868 diff.SetHEADPeg(m_LogRevision);
58695869 diff.ShowCompare(CTSVNPath(pCmi->PathURL), pCmi->RevPrevious,
58705870 CTSVNPath(pCmi->PathURL), pCmi->RevSelected, SVNRev(),
5871- false, L"", false, true, nodekind);
5871+ false, true, L"", false, true, nodekind);
58725872 };
58735873 new async::CAsyncCall(f, &netScheduler);
58745874 netScheduler.WaitForEmptyQueue();
@@ -5877,7 +5877,7 @@
58775877 {
58785878 CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pCmi->PathURL),
58795879 pCmi->RevPrevious, CTSVNPath(pCmi->PathURL), pCmi->RevSelected,
5880- SVNRev(), m_LogRevision, false, L"", false, false, true, nodekind);
5880+ SVNRev(), m_LogRevision, false, true, L"", false, false, true, nodekind);
58815881 }
58825882 }
58835883
Show on old repository browser