• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revisão28970 (tree)
Hora2020-09-17 04:45:34
Autorstefankueng

Mensagem de Log

Merged revision(s) r28969 from trunk:
* use the wc root to compose the wc path of a file in the log dialog file list.

Mudança Sumário

Diff

--- branches/1.14.x/src/Changelog.txt (revision 28969)
+++ branches/1.14.x/src/Changelog.txt (revision 28970)
@@ -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
--- branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28969)
+++ branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28970)
@@ -7188,13 +7188,15 @@
71887188 {
71897189 // firstfile = (e.g.) http://mydomain.com/repos/trunk/folder/file1
71907190 // pCmi->sUrl = http://mydomain.com/repos/trunk/folder
7191- CString sUnescapedUrl = CPathUtils::PathUnescape(pCmi->sUrl);
7191+ auto wcroot = GetWCRootFromPath(m_path);
7192+ auto wcrooturl = GetURLFromPath(wcroot);
7193+ CString sUnescapedUrl = CPathUtils::PathUnescape(wcrooturl);
71927194 // find out until which char the urls are identical
71937195 int i = 0;
71947196 while ((i < pCmi->fileUrl.GetLength()) && (i < sUnescapedUrl.GetLength()) && (pCmi->fileUrl[i] == sUnescapedUrl[i]))
71957197 i++;
7196- int leftcount = m_path.GetWinPathString().GetLength() - (sUnescapedUrl.GetLength() - i);
7197- pCmi->wcPath = m_path.GetWinPathString().Left(leftcount);
7198+ int leftcount = wcroot.GetWinPathString().GetLength() - (sUnescapedUrl.GetLength() - i);
7199+ pCmi->wcPath = wcroot.GetWinPathString().Left(leftcount);
71987200 pCmi->wcPath += pCmi->fileUrl.Mid(i);
71997201 pCmi->wcPath.Replace('/', '\\');
72007202 }
Show on old repository browser