• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28402 (tree)
Time2018-10-12 03:05:51
Authorstefankueng

Log Message

Fix more diffing by adding the missing 'prettypring' parameter.

Change Summary

Incremental Difference

--- trunk/src/SVN/SVNStatusListCtrl.cpp (revision 28401)
+++ trunk/src/SVN/SVNStatusListCtrl.cpp (revision 28402)
@@ -3941,11 +3941,15 @@
39413941 else
39423942 {
39433943 CString options;
3944+ bool prettyprint = true;
39443945 if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
39453946 {
39463947 CDiffOptionsDlg dlg(this);
39473948 if (dlg.DoModal() == IDOK)
3949+ {
39483950 options = dlg.GetDiffOptionsString();
3951+ prettyprint = dlg.GetPrettyPrint();
3952+ }
39493953 else
39503954 break;
39513955 }
@@ -3952,9 +3956,9 @@
39523956 SVNDiff diff(NULL, this->m_hWnd, true);
39533957
39543958 if (entry->remotestatus <= svn_wc_status_normal)
3955- CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC, SVNRev(), SVNRev(), options, false, false, false, false);
3959+ CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC, SVNRev(), SVNRev(), prettyprint, options, false, false, false, false);
39563960 else
3957- CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD, SVNRev(), SVNRev(), options, false, false, false, false);
3961+ CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD, SVNRev(), SVNRev(), prettyprint, options, false, false, false, false);
39583962 }
39593963 }
39603964 break;
--- trunk/src/TortoiseProc/Commands/DiffCommand.cpp (revision 28401)
+++ trunk/src/TortoiseProc/Commands/DiffCommand.cpp (revision 28402)
@@ -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, false, diffoptions, false, bBlame);
49+ bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, pegRevision, ignoreprops, parser.HasKey(L"prettyprint"), diffoptions, false, bBlame);
5050 }
5151 else
5252 {
@@ -59,7 +59,7 @@
5959 CString diffoptions;
6060 if (parser.HasVal(L"diffoptions"))
6161 diffoptions = parser.GetVal(L"diffoptions");
62- diff.ShowUnifiedDiff(cmdLinePath, SVNRev::REV_BASE, cmdLinePath, SVNRev::REV_WC, pegRevision, diffoptions, false, bBlame, false);
62+ diff.ShowUnifiedDiff(cmdLinePath, SVNRev::REV_BASE, cmdLinePath, SVNRev::REV_WC, pegRevision, !!parser.HasKey(L"prettyprint"), diffoptions, false, bBlame, false);
6363 }
6464 else
6565 {
--- trunk/src/TortoiseProc/Commands/PrevDiffCommand.cpp (revision 28401)
+++ trunk/src/TortoiseProc/Commands/PrevDiffCommand.cpp (revision 28402)
@@ -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, false, 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, true, L"", false, false, st.status->kind);
4848 }
4949 else
5050 {
--- trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28401)
+++ trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28402)
@@ -2757,12 +2757,12 @@
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, false, L"", false, false, nodekind);
2760+ diff.ShowCompare(path, rev2, path, rev1, SVNRev(), false, true, L"", false, false, nodekind);
27612761 }
27622762 else
27632763 {
27642764 CAppUtils::StartShowCompare(m_hWnd, path, rev2, path, rev1, SVNRev(),
2765- m_LogRevision, false, false, L"", !!(GetAsyncKeyState(VK_SHIFT) & 0x8000), false, false, nodekind);
2765+ m_LogRevision, false, true, L"", !!(GetAsyncKeyState(VK_SHIFT) & 0x8000), false, false, nodekind);
27662766 }
27672767
27682768 EnableOKButton();
@@ -2818,12 +2818,16 @@
28182818 diff.SetHEADPeg(rev1);
28192819 if (unified)
28202820 {
2821+ bool prettyprint = true;
28212822 CString options;
28222823 if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
28232824 {
28242825 CDiffOptionsDlg dlg(this);
28252826 if (dlg.DoModal() == IDOK)
2827+ {
28262828 options = dlg.GetDiffOptionsString();
2829+ prettyprint = dlg.GetPrettyPrint();
2830+ }
28272831 else
28282832 {
28292833 EnableOKButton();
@@ -2832,15 +2836,15 @@
28322836 }
28332837 if (PromptShown())
28342838 diff.ShowUnifiedDiff(CTSVNPath(secondfile), rev2, CTSVNPath(firstfile), rev1,
2835- SVNRev(), options, false, ignoreprops);
2839+ SVNRev(), prettyprint, options, false, ignoreprops);
28362840 else
28372841 CAppUtils::StartShowUnifiedDiff(m_hWnd, CTSVNPath(secondfile), rev2, CTSVNPath(firstfile),
2838- rev1, SVNRev(), m_LogRevision, options, false, false, blame, ignoreprops);
2842+ rev1, SVNRev(), m_LogRevision, prettyprint, options, false, false, blame, ignoreprops);
28392843 }
28402844 else
28412845 {
28422846 diff.ShowCompare(CTSVNPath(secondfile), rev2, CTSVNPath(firstfile), rev1, SVNRev(),
2843- ignoreprops, false, L"", false, blame, nodekind);
2847+ ignoreprops, true, L"", false, blame, nodekind);
28442848 }
28452849 EnableOKButton();
28462850 }
@@ -5480,11 +5484,15 @@
54805484 void CLogDlg::ExecuteGnuDiff1MenuRevisions(ContextMenuInfoForRevisionsPtr& pCmi)
54815485 {
54825486 CString options;
5487+ bool prettyprint = true;
54835488 if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
54845489 {
54855490 CDiffOptionsDlg dlg(this);
54865491 if (dlg.DoModal() == IDOK)
5492+ {
54875493 options = dlg.GetDiffOptionsString();
5494+ prettyprint = dlg.GetPrettyPrint();
5495+ }
54885496 else
54895497 return;
54905498 }
@@ -5498,13 +5506,13 @@
54985506
54995507 SVNDiff diff(this, this->m_hWnd, true);
55005508 diff.SetHEADPeg(m_LogRevision);
5501- diff.ShowUnifiedDiff(m_path, pCmi->RevPrevious, m_path, pCmi->RevSelected, SVNRev(), options, false, false, false);
5509+ diff.ShowUnifiedDiff(m_path, pCmi->RevPrevious, m_path, pCmi->RevSelected, SVNRev(), prettyprint, options, false, false, false);
55025510 };
55035511 new async::CAsyncCall(f, &netScheduler);
55045512 }
55055513 else
55065514 CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, pCmi->RevPrevious, m_path,
5507- pCmi->RevSelected, SVNRev(), m_LogRevision, options, false, false, false, false);
5515+ pCmi->RevSelected, SVNRev(), m_LogRevision, prettyprint, options, false, false, false, false);
55085516 }
55095517
55105518 void CLogDlg::ExecuteGnuDiff2MenuRevisions(ContextMenuInfoForRevisionsPtr& pCmi)
@@ -5520,11 +5528,15 @@
55205528 // is included in the diff
55215529 r2 = r2 - svn_revnum_t(1);
55225530 CString options;
5531+ bool prettyprint = true;
55235532 if (GetAsyncKeyState(VK_SHIFT) & 0x8000)
55245533 {
55255534 CDiffOptionsDlg dlg(this);
55265535 if (dlg.DoModal() == IDOK)
5536+ {
55275537 options = dlg.GetDiffOptionsString();
5538+ prettyprint = dlg.GetPrettyPrint();
5539+ }
55285540 else
55295541 return;
55305542 }
@@ -5538,12 +5550,12 @@
55385550
55395551 SVNDiff diff(this, this->m_hWnd, true);
55405552 diff.SetHEADPeg(m_LogRevision);
5541- diff.ShowUnifiedDiff(m_path, r2, m_path, r1, SVNRev(), options, false, false, false);
5553+ diff.ShowUnifiedDiff(m_path, r2, m_path, r1, SVNRev(), prettyprint, options, false, false, false);
55425554 };
55435555 new async::CAsyncCall(f, &netScheduler);
55445556 }
55455557 else
5546- CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, r2, m_path, r1, SVNRev(), m_LogRevision, options, false, false, false, false);
5558+ CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, r2, m_path, r1, SVNRev(), m_LogRevision, prettyprint, options, false, false, false, false);
55475559 }
55485560
55495561 void CLogDlg::ExecuteRevertRevisionMenuRevisions(ContextMenuInfoForRevisionsPtr& pCmi)
@@ -5750,13 +5762,13 @@
57505762 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
57515763 diff.SetHEADPeg(m_LogRevision);
57525764 diff.ShowCompare(CTSVNPath(pCmi->PathURL), r2, CTSVNPath(pCmi->PathURL),
5753- r1, SVNRev(), false, false, L"", false, false, nodekind);
5765+ r1, SVNRev(), false, true, L"", false, false, nodekind);
57545766 };
57555767 new async::CAsyncCall(f, &netScheduler);
57565768 }
57575769 else
57585770 CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pCmi->PathURL), r2, CTSVNPath(pCmi->PathURL), r1,
5759- SVNRev(), m_LogRevision, false, false, L"", !!(GetAsyncKeyState(VK_SHIFT) & 0x8000),
5771+ SVNRev(), m_LogRevision, false, true, L"", !!(GetAsyncKeyState(VK_SHIFT) & 0x8000),
57605772 false, false, nodekind);
57615773 }
57625774
--- trunk/src/TortoiseProc/RepositoryBrowser.cpp (revision 28401)
+++ trunk/src/TortoiseProc/RepositoryBrowser.cpp (revision 28402)
@@ -4219,11 +4219,15 @@
42194219 const CTSVNPath& path = selection.GetURLEscaped (0, 0);
42204220 const SVNRev& revision = selection.GetRepository (0).revision;
42214221 CString options;
4222+ bool prettyprint = true;
42224223 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
42234224 {
42244225 CDiffOptionsDlg dlg;
42254226 if (dlg.DoModal() == IDOK)
4227+ {
42264228 options = dlg.GetDiffOptionsString();
4229+ prettyprint = dlg.GetPrettyPrint();
4230+ }
42274231 else
42284232 break;
42294233 }
@@ -4232,10 +4236,10 @@
42324236 {
42334237 if (PromptShown())
42344238 diff.ShowUnifiedDiff (path, revision,
4235- CTSVNPath(EscapeUrl(m_diffURL)), revision, SVNRev(), options, false, false, false);
4239+ CTSVNPath(EscapeUrl(m_diffURL)), revision, SVNRev(), prettyprint, options, false, false, false);
42364240 else
42374241 CAppUtils::StartShowUnifiedDiff(m_hWnd, path, revision,
4238- CTSVNPath(EscapeUrl(m_diffURL)), revision, SVNRev(), SVNRev(), options, false, false, false, false);
4242+ CTSVNPath(EscapeUrl(m_diffURL)), revision, SVNRev(), SVNRev(), prettyprint, options, false, false, false, false);
42394243 }
42404244 else
42414245 {
@@ -4242,10 +4246,10 @@
42424246 const CTSVNPath& path2 = selection.GetURLEscaped (0, 1);
42434247 if (PromptShown())
42444248 diff.ShowUnifiedDiff(path, revision,
4245- path2, revision, SVNRev(), options, false, false, false);
4249+ path2, revision, SVNRev(), prettyprint, options, false, false, false);
42464250 else
42474251 CAppUtils::StartShowUnifiedDiff(m_hWnd, path, revision,
4248- path2, revision, SVNRev(), SVNRev(), options, false, false, false, false);
4252+ path2, revision, SVNRev(), SVNRev(), prettyprint, options, false, false, false, false);
42494253 }
42504254 }
42514255 break;
Show on old repository browser