• R/O
  • SSH
  • HTTPS

tortoisesvn: コミット


コミットメタ情報

リビジョン29017 (tree)
日時2020-10-31 04:13:07
作者stefankueng

ログメッセージ

Merged revision(s) r29012, r29013, r29014, r29015 from trunk:
* check if the url exists before trying to get the log for it.
* only send WM_REVSELECTED messages if there's at least one revision selected.
* ignore the generated include folder.
* mark lines with whitespace changes as hidden so they can be collapsed.

変更サマリ

差分

--- branches/1.14.x/src/Changelog.txt (revision 29016)
+++ branches/1.14.x/src/Changelog.txt (revision 29017)
@@ -18,6 +18,10 @@
1818 list of the log dialog failed if the path
1919 wasn't a child of the path the log dialog
2020 was shown for. (Stefan)
21+- BUG: crash when updating an external with an
22+ invalid/non-existing URL. (Stefan)
23+- BUG: Lines with only ignored whitespace changes
24+ were not collapsed in TMerge. (Stefan)
2125
2226 Version 1.14.0
2327 See the release notes: https://tortoisesvn.net/tsvn_1.14_releasenotes.html
--- branches/1.14.x/src/TortoiseMerge/DiffData.cpp (revision 29016)
+++ branches/1.14.x/src/TortoiseMerge/DiffData.cpp (revision 29017)
@@ -1,6 +1,6 @@
11 // TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2006-2017 - TortoiseSVN
3+// Copyright (C) 2006-2017, 2020 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -421,8 +421,8 @@
421421 if (changedWS || dwIgnoreWS == 0)
422422 {
423423 // one-pane view: two lines, one 'removed' and one 'added'
424- m_YourBaseBoth.AddData(sCurrentBaseLine, DIFFSTATE_REMOVEDWHITESPACE, yourline, endingBase, HIDESTATE_SHOWN, -1);
425- m_YourBaseBoth.AddData(sCurrentYourLine, DIFFSTATE_ADDEDWHITESPACE, yourline, endingYours, HIDESTATE_SHOWN, -1);
424+ m_YourBaseBoth.AddData(sCurrentBaseLine, DIFFSTATE_REMOVEDWHITESPACE, yourline, endingBase, changedWS && dwIgnoreWS ? HIDESTATE_HIDDEN : HIDESTATE_SHOWN, -1);
425+ m_YourBaseBoth.AddData(sCurrentYourLine, DIFFSTATE_ADDEDWHITESPACE, yourline, endingYours, changedWS && dwIgnoreWS ? HIDESTATE_HIDDEN : HIDESTATE_SHOWN, -1);
426426 }
427427 else
428428 {
@@ -531,8 +531,8 @@
531531 ds = DIFFSTATE_FILTEREDDIFF;
532532 }
533533
534- m_YourBaseLeft.AddData(sCurrentBaseLine, ds, baseline, endingBase, HIDESTATE_SHOWN, -1);
535- m_YourBaseRight.AddData(sCurrentYourLine, ds, yourline, endingYours, HIDESTATE_SHOWN, -1);
534+ m_YourBaseLeft.AddData(sCurrentBaseLine, ds, baseline, endingBase, (ds == DIFFSTATE_NORMAL) && dwIgnoreWS ? HIDESTATE_HIDDEN : HIDESTATE_SHOWN, -1);
535+ m_YourBaseRight.AddData(sCurrentYourLine, ds, yourline, endingYours, (ds == DIFFSTATE_NORMAL) && dwIgnoreWS ? HIDESTATE_HIDDEN : HIDESTATE_SHOWN, -1);
536536 }
537537 else
538538 {
--- branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 29016)
+++ branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 29017)
@@ -2526,10 +2526,13 @@
25262526 }
25272527 if (!bSentMessage)
25282528 {
2529- m_pNotifyWindow->SendMessage(WM_REVSELECTED,
2530- m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
2531- m_pNotifyWindow->SendMessage(WM_REVSELECTED,
2532- m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
2529+ if (m_selectedRevs.GetCount() > 0)
2530+ {
2531+ m_pNotifyWindow->SendMessage(WM_REVSELECTED,
2532+ m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
2533+ m_pNotifyWindow->SendMessage(WM_REVSELECTED,
2534+ m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
2535+ }
25332536 m_pNotifyWindow->SendMessage(WM_REVLIST,
25342537 m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
25352538 if (m_selectedRevsOneRange.GetCount())
--- branches/1.14.x/src/TortoiseProc/Properties/EditPropExternals.cpp (revision 29016)
+++ branches/1.14.x/src/TortoiseProc/Properties/EditPropExternals.cpp (revision 29017)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2010-2015 - TortoiseSVN
3+// Copyright (C) 2010-2015, 2020 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -434,11 +434,14 @@
434434 m_externals[index].root = svn.GetRepositoryRoot(path_);
435435 }
436436 auto fullurl = CTSVNPath(m_externals[index].fullurl);
437- auto youngestRev = logHelper.GetYoungestRev(fullurl);
438- if (!youngestRev.IsValid())
439- m_externals[index].headrev = svn.GetHEADRevision(fullurl, true);
440- else
441- m_externals[index].headrev = youngestRev;
437+ if (!fullurl.IsEmpty())
438+ {
439+ auto youngestRev = logHelper.GetYoungestRev(fullurl);
440+ if (!youngestRev.IsValid())
441+ m_externals[index].headrev = svn.GetHEADRevision(fullurl, true);
442+ else
443+ m_externals[index].headrev = youngestRev;
444+ }
442445 }
443446 }
444447 }
旧リポジトリブラウザで表示