• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28969 (tree)
Zeit2020-09-17 02:14:05
Autorstefankueng

Log Message

use the wc root to compose the wc path of a file in the log dialog file list.

Ändern Zusammenfassung

Diff

--- trunk/src/Changelog.txt (revision 28968)
+++ trunk/src/Changelog.txt (revision 28969)
@@ -14,6 +14,10 @@
1414 - BUG: hook scripts were executed for wc's that
1515 didn't have them set up when updating
1616 multiple wcs at once. (Stefan)
17+- BUG: "compare with working copy" from the file
18+ list of the log dialog failed if the path
19+ wasn't a child of the path the log dialog
20+ was shown for. (Stefan)
1721
1822 Version 1.14.0
1923 See the release notes: https://tortoisesvn.net/tsvn_1.14_releasenotes.html
--- trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28968)
+++ trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28969)
@@ -7187,13 +7187,15 @@
71877187 {
71887188 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
71897189 // pCmi->sUrl = http://mydomain.com/repos/trunk/folder
7190- CString sUnescapedUrl = CPathUtils::PathUnescape(pCmi->sUrl);
7190+ auto wcroot = GetWCRootFromPath(m_path);
7191+ auto wcrooturl = GetURLFromPath(wcroot);
7192+ CString sUnescapedUrl = CPathUtils::PathUnescape(wcrooturl);
71917193 // find out until which char the urls are identical
71927194 int i = 0;
71937195 while ((i < pCmi->fileUrl.GetLength()) && (i < sUnescapedUrl.GetLength()) && (pCmi->fileUrl[i] == sUnescapedUrl[i]))
71947196 i++;
7195- int leftcount = m_path.GetWinPathString().GetLength() - (sUnescapedUrl.GetLength() - i);
7196- pCmi->wcPath = m_path.GetWinPathString().Left(leftcount);
7197+ int leftcount = wcroot.GetWinPathString().GetLength() - (sUnescapedUrl.GetLength() - i);
7198+ pCmi->wcPath = wcroot.GetWinPathString().Left(leftcount);
71977199 pCmi->wcPath += pCmi->fileUrl.Mid(i);
71987200 pCmi->wcPath.Replace('/', '\\');
71997201 }
Show on old repository browser