• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28247 (tree)
Time2018-06-07 02:46:23
Authorstefankueng

Log Message

Show the url from where the update happens in the progress dialog.

Change Summary

Incremental Difference

--- trunk/src/TortoiseProc/SVNProgressDlg.cpp (revision 28246)
+++ trunk/src/TortoiseProc/SVNProgressDlg.cpp (revision 28247)
@@ -465,6 +465,14 @@
465465 bNoNotify = true;
466466 break;
467467 }
468+ else
469+ {
470+ if (url.IsEmpty())
471+ {
472+ data->url = CTSVNPath(GetURLFromPath(path));
473+ data->sPathColumnText.FormatMessage(IDS_PROGRS_UPDATE, data->path.GetWinPath(), (LPCWSTR)data->url.GetSVNPathString());
474+ }
475+ }
468476 data->sActionColumnText.LoadString(IDS_SVNACTION_UPDATING);
469477 m_basePath = path;
470478 m_bConflictWarningShown = false;
@@ -3802,9 +3810,7 @@
38023810 }
38033811 }
38043812 }
3805- CString sCmdInfo;
3806- sCmdInfo.FormatMessage(IDS_PROGRS_CMD_UPDATE, (LPCWSTR)GetURLFromPath(m_targetPathList.GetCommonRoot()));
3807- ReportCmd(sCmdInfo);
3813+ ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_UPDATE)));
38083814 CBlockCacheForPath cacheBlock (m_targetPathList[0].GetWinPath());
38093815 if (!Update(m_targetPathList, m_Revision, m_depth, (m_options & ProgOptStickyDepth) != 0, (m_options & ProgOptIgnoreExternals) != 0, !!DWORD(CRegDWORD(L"Software\\TortoiseSVN\\AllowUnversionedObstruction", true)), true))
38103816 {
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Show on old repository browser