• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28713 (tree)
Time2020-01-11 03:34:07
Authorstefankueng

Log Message

properly reconstruct the WC path of file-list items in the bottom pane of the log dialog.

Change Summary

Incremental Difference

--- trunk/src/Changelog.txt (revision 28712)
+++ trunk/src/Changelog.txt (revision 28713)
@@ -1,5 +1,8 @@
11 Version 1.13.2
22 - BUG: Crash in TMerge when indenting. (Stefan)
3+- BUG: Context menu in log dialog bottom pane
4+ would not work properly if repo url
5+ contains escaped chars. (Stefan)
36
47 Version 1.13.1
58 - BUG: binary files were not digitally signed
--- trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28712)
+++ trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28713)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2019 - TortoiseSVN
3+// Copyright (C) 2003-2020 - 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
@@ -7119,13 +7119,14 @@
71197119 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
71207120 // pCmi->sUrl = http://mydomain.com/repos/trunk/folder
71217121 CString sUnescapedUrl = CPathUtils::PathUnescape(pCmi->sUrl);
7122+ CString sUnescapedFileUrl = CPathUtils::PathUnescape(pCmi->fileUrl);
71227123 // find out until which char the urls are identical
71237124 int i = 0;
7124- while ((i < pCmi->fileUrl.GetLength()) && (i < sUnescapedUrl.GetLength()) && (pCmi->fileUrl[i] == sUnescapedUrl[i]))
7125+ while ((i < pCmi->fileUrl.GetLength()) && (i < sUnescapedUrl.GetLength()) && (sUnescapedFileUrl[i] == sUnescapedUrl[i]))
71257126 i++;
71267127 int leftcount = m_path.GetWinPathString().GetLength() - (sUnescapedUrl.GetLength() - i);
71277128 pCmi->wcPath = m_path.GetWinPathString().Left(leftcount);
7128- pCmi->wcPath += pCmi->fileUrl.Mid(i);
7129+ pCmi->wcPath += sUnescapedFileUrl.Mid(i);
71297130 pCmi->wcPath.Replace('/', '\\');
71307131 }
71317132 }
Show on old repository browser