| CODENOTIFIER | HelpYou are not signed inSign in |
Project: TortoiseSVN
Revision: 13823
Author: steveking
Date: 04 Sep 2008 12:57:13
Changes:If fetching the file with peg revision HEAD fails, try again with the file revision as the peg revision before giving up.
Files:| ...... | @@ -297,13 +297,19 @@ | |
| 297 | 297 | |
| 298 | 298 | if ((fd.kind != svn_client_diff_summarize_kind_added)&&(!blame)&&(!Cat(url1, m_bDoPegDiff ? m_peg : m_rev1, m_rev1, tempfile))) |
| 299 | 299 | { |
| 300 | CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 301 | return; | |
| 300 | if ((!m_bDoPegDiff)||(!Cat(url1, m_rev1, m_rev1, tempfile))) | |
| 301 | { | |
| 302 | CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 303 | return; | |
| 304 | } | |
| 302 | 305 | } |
| 303 | 306 | else if ((fd.kind != svn_client_diff_summarize_kind_added)&&(blame)&&(!m_blamer.BlameToFile(url1, 1, m_rev1, m_bDoPegDiff ? m_peg : m_rev1, tempfile, _T(""), TRUE, TRUE))) |
| 304 | 307 | { |
| 305 | CMessageBox::Show(NULL, m_blamer.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 306 | return; | |
| 308 | if ((!m_bDoPegDiff)||(!m_blamer.BlameToFile(url1, 1, m_rev1, m_rev1, tempfile, _T(""), TRUE, TRUE))) | |
| 309 | { | |
| 310 | CMessageBox::Show(NULL, m_blamer.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 311 | return; | |
| 312 | } | |
| 307 | 313 | } |
| 308 | 314 | SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY); |
| 309 | 315 | progDlg.SetProgress(1, 2); |
| ...... | @@ -312,13 +318,19 @@ | |
| 312 | 318 | CTSVNPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, url2, m_rev2); |
| 313 | 319 | if ((fd.kind != svn_client_diff_summarize_kind_deleted)&&(!blame)&&(!Cat(url2, m_bDoPegDiff ? m_peg : m_rev2, m_rev2, tempfile2))) |
| 314 | 320 | { |
| 315 | CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 316 | return; | |
| 321 | if ((!m_bDoPegDiff)||(!Cat(url2, m_rev2, m_rev2, tempfile2))) | |
| 322 | { | |
| 323 | CMessageBox::Show(NULL, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 324 | return; | |
| 325 | } | |
| 317 | 326 | } |
| 318 | 327 | else if ((fd.kind != svn_client_diff_summarize_kind_deleted)&&(blame)&&(!m_blamer.BlameToFile(url2, 1, m_bDoPegDiff ? m_peg : m_rev2, m_rev2, tempfile2, _T(""), TRUE, TRUE))) |
| 319 | 328 | { |
| 320 | CMessageBox::Show(NULL, m_blamer.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 321 | return; | |
| 329 | if ((!m_bDoPegDiff)||(!m_blamer.BlameToFile(url2, 1, m_rev2, m_rev2, tempfile2, _T(""), TRUE, TRUE))) | |
| 330 | { | |
| 331 | CMessageBox::Show(NULL, m_blamer.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); | |
| 332 | return; | |
| 333 | } | |
| 322 | 334 | } |
| 323 | 335 | SetFileAttributes(tempfile2.GetWinPath(), FILE_ATTRIBUTE_READONLY); |
| 324 | 336 | progDlg.SetProgress(2,2); |
| ...... | @@ -26,6 +26,8 @@ | |
| 26 | 26 | to unescape the target folder. (Stefan) |
| 27 | 27 | - BUG: If an url had special chars which needed escaping below the |
| 28 | 28 | repository root, showing the log did not always work. (Stefan) |
| 29 | - BUG: Comparing two revisions sometimes did not work if the url didn't | |
| 30 | exist anymore in HEAD. (Stefan) | |
| 29 | 31 | |
| 30 | 32 | Version 1.5.3 |
| 31 | 33 | - CHG: paths in error messages are nor truncated to 80 chars anymore. (Stefan) |