• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28356 (tree)
Time2018-09-15 00:10:13
Authorstefankueng

Log Message

extend methods to take a prettyprint parameter.

Change Summary

Incremental Difference

--- trunk/src/TortoiseProc/AppUtils.cpp (revision 28355)
+++ trunk/src/TortoiseProc/AppUtils.cpp (revision 28356)
@@ -1096,7 +1096,7 @@
10961096 bool CAppUtils::StartShowUnifiedDiff(HWND hWnd, const CTSVNPath& url1, const SVNRev& rev1,
10971097 const CTSVNPath& url2, const SVNRev& rev2,
10981098 const SVNRev& peg, const SVNRev& headpeg,
1099- const CString& options,
1099+ bool prettyprint, const CString& options,
11001100 bool bAlternateDiff /* = false */, bool bIgnoreAncestry /* = false */, bool blame /* = false */, bool bIgnoreProperties /* = true*/)
11011101 {
11021102 CString sCmd = L"/command:showcompare /unified";
@@ -1128,6 +1128,9 @@
11281128 if (bIgnoreProperties)
11291129 sCmd += L" /ignoreprops";
11301130
1131+ if (prettyprint)
1132+ sCmd += L" /prettyprint";
1133+
11311134 if (hWnd)
11321135 {
11331136 sCmd += L" /hwnd:";
@@ -1142,7 +1145,7 @@
11421145 bool CAppUtils::StartShowCompare(HWND hWnd, const CTSVNPath& url1, const SVNRev& rev1,
11431146 const CTSVNPath& url2, const SVNRev& rev2,
11441147 const SVNRev& peg, const SVNRev& headpeg,
1145- bool ignoreprops, const CString& options,
1148+ bool ignoreprops, bool prettyprint, const CString& options,
11461149 bool bAlternateDiff /*= false*/, bool bIgnoreAncestry /*= false*/,
11471150 bool blame /*= false*/, svn_node_kind_t nodekind /*= svn_node_unknown*/,
11481151 int line /*= 0*/ )
@@ -1171,6 +1174,8 @@
11711174 sCmd += L" /blame";
11721175 if (ignoreprops)
11731176 sCmd += L" /ignoreprops";
1177+ if (prettyprint)
1178+ sCmd += L" /prettyprint";
11741179
11751180 if (hWnd)
11761181 {
--- trunk/src/TortoiseProc/AppUtils.h (revision 28355)
+++ trunk/src/TortoiseProc/AppUtils.h (revision 28356)
@@ -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-2014, 2016-2017 - TortoiseSVN
3+// Copyright (C) 2003-2014, 2016-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
@@ -163,6 +163,7 @@
163163 static bool StartShowUnifiedDiff(HWND hWnd, const CTSVNPath& url1, const SVNRev& rev1,
164164 const CTSVNPath& url2, const SVNRev& rev2,
165165 const SVNRev& peg, const SVNRev& headpeg,
166+ bool prettyprint,
166167 const CString& options,
167168 bool bAlternateDiff = false,
168169 bool bIgnoreAncestry = false,
@@ -175,7 +176,7 @@
175176 static bool StartShowCompare(HWND hWnd, const CTSVNPath& url1, const SVNRev& rev1,
176177 const CTSVNPath& url2, const SVNRev& rev2,
177178 const SVNRev& peg, const SVNRev& headpeg,
178- bool ignoreprops, const CString& options,
179+ bool ignoreprops, bool prettyprint, const CString& options,
179180 bool bAlternateDiff = false, bool bIgnoreAncestry = false,
180181 bool blame = false, svn_node_kind_t nodekind = svn_node_unknown,
181182 int line = 0);
Show on old repository browser