• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28645 (tree)
Zeit2019-08-04 18:58:12
Autorstefankueng

Log Message

Skip over deleted items when exporting.

Ändern Zusammenfassung

Diff

--- trunk/src/Changelog.txt (revision 28644)
+++ trunk/src/Changelog.txt (revision 28645)
@@ -1,4 +1,8 @@
1-Version 1.12.1
1+Version 1.12.2
2+- BUG: Exporting files from the log dialog
3+ stopped at deleted entries. (Stefan)
4+
5+Version 1.12.1
26 - BUG: Crash in the repo browser if externals
37 with relative paths were present. (Stefan)
48 - BUG: "save as..." from the log dialog saved
--- trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28644)
+++ trunk/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 28645)
@@ -7584,6 +7584,11 @@
75847584 progDlg.SetTime(true);
75857585 for (size_t i = 0; i < pCmi->ChangedLogPathIndices.size(); ++i)
75867586 {
7587+ if (m_currentChangedArray[pCmi->ChangedLogPathIndices[i]].GetAction() == LOGACTIONS_DELETED)
7588+ continue;
7589+ if (m_currentChangedArray[pCmi->ChangedLogPathIndices[i]].GetNodeKind() == svn_node_dir)
7590+ continue;
7591+
75877592 const CString& schangedlogpath = m_currentChangedArray[pCmi->ChangedLogPathIndices[i]].GetPath();
75887593
75897594 SVNRev getrev = pCmi->Rev1;
@@ -7598,6 +7603,8 @@
75987603 progDlg.SetLine(2, tempfile.GetWinPath(), true);
75997604 progDlg.SetProgress64(i, pCmi->ChangedLogPathIndices.size());
76007605 progDlg.ShowModeless(m_hWnd);
7606+ if (progDlg.HasUserCancelled())
7607+ break;
76017608
76027609 SHCreateDirectoryEx(m_hWnd, tempfile.GetContainingDirectory().GetWinPath(),
76037610 NULL);
Show on old repository browser