• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision27116 (tree)
Zeit2016-01-05 04:25:52
Autorstefankueng

Log Message

Merge revisions r27097, r27100-27101, r27107-27108 and r27111-27114 from trunk:
* update copyright year to 2016
* Nothing better to do on new years eve at midnight, so update the checkyear script and the copyright resources to 2016. Happy New Year 2016!
* Unnecessary horizontal scrollbar is shown in case logwidthmarker is set
* Use a better dummy text so screen readers won't stutter from the X'es.
* Remove doubled InterlockedExchange for m_bBlock. * only allow starting the thread if m_bBlock isn't already set.
* mark the ref counter as volatile.
* Don't mark the conflict as resolved if the changes could not be saved.
* Drop description strings use only a subset of the FormatMessage specifiers, so remove the "!ls!" part and only leave "%1", otherwise the "!ls!" part is shown as part of the text.
* Only change the path if the root url has changed. Otherwise we'll lose the connection to the working copy (if there was any).

Ändern Zusammenfassung

Diff

--- branches/1.9.x/Languages/TortoiseDocPotHeader.txt (revision 27115)
+++ branches/1.9.x/Languages/TortoiseDocPotHeader.txt (revision 27116)
@@ -1,6 +1,6 @@
11 #
22 # Translation of the TortoiseSVN manuals
3-# Copyright (C) 2004-2015 the TortoiseSVN team
3+# Copyright (C) 2004-2016 the TortoiseSVN team
44 #
55 # This file is distributed under the same license as TortoiseSVN
66 #
--- branches/1.9.x/Languages/TortoiseUIPotHeader.txt (revision 27115)
+++ branches/1.9.x/Languages/TortoiseUIPotHeader.txt (revision 27116)
@@ -1,6 +1,6 @@
11 #
22 # Translation of the TortoiseSVN user interface
3-# Copyright (C) 2004-2015 the TortoiseSVN team
3+# Copyright (C) 2004-2016 the TortoiseSVN team
44 #
55 # This file is distributed under the same license as TortoiseSVN
66 #
--- branches/1.9.x/contrib/hook-scripts/client-side/checkyear.js (revision 27115)
+++ branches/1.9.x/contrib/hook-scripts/client-side/checkyear.js (revision 27116)
@@ -20,7 +20,7 @@
2020 WScript.Quit(1);
2121 }
2222
23-var re = /^\/\/ Copyright.+(2015)(.*)/;
23+var re = /^\/\/ Copyright.+(2016)(.*)/;
2424 var basere = /^\/\/ Copyright(.*)/;
2525 var filere = /(\.cpp$)|(\.h$)|(\.idl$)/;
2626
--- branches/1.9.x/src/TortoiseMerge/MainFrm.cpp (revision 27115)
+++ branches/1.9.x/src/TortoiseMerge/MainFrm.cpp (revision 27116)
@@ -1,6 +1,6 @@
11 // TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2004-2015 - TortoiseSVN
3+// Copyright (C) 2004-2016 - 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
@@ -2092,7 +2092,8 @@
20922092 {
20932093 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
20942094 {
2095- FileSave(false);
2095+ if (!FileSave(false))
2096+ return;
20962097 m_bSaveRequired = false;
20972098 }
20982099 }
--- branches/1.9.x/src/TortoiseProc/CommitDlg.cpp (revision 27115)
+++ branches/1.9.x/src/TortoiseProc/CommitDlg.cpp (revision 27116)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2015 - TortoiseSVN
3+// Copyright (C) 2003-2016 - 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
@@ -831,6 +831,8 @@
831831 if (m_bThreadRunning)
832832 return;
833833
834+ if (InterlockedExchange(&m_bBlock, TRUE) != FALSE)
835+ return;
834836 if (m_pThread)
835837 {
836838 delete m_pThread;
@@ -837,7 +839,6 @@
837839 m_pThread = NULL;
838840 }
839841
840- InterlockedExchange(&m_bBlock, TRUE);
841842 m_pThread = AfxBeginThread(StatusThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);
842843 if (m_pThread==NULL)
843844 {
@@ -846,7 +847,6 @@
846847 }
847848 else
848849 {
849- InterlockedExchange(&m_bBlock, TRUE);
850850 InterlockedExchange(&m_bThreadRunning, TRUE);// so the main thread knows that this thread is still running
851851 InterlockedExchange(&m_bRunThread, TRUE); // if this is set to FALSE, the thread should stop
852852 m_pThread->m_bAutoDelete = FALSE;
--- branches/1.9.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 27115)
+++ branches/1.9.x/src/TortoiseProc/LogDialog/LogDlg.cpp (revision 27116)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2015 - TortoiseSVN
3+// Copyright (C) 2003-2016 - 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
@@ -4310,10 +4310,11 @@
43104310 *pBuf = 0;
43114311 }
43124312 break;
4313- case 1: //action -- dummy text, not drawn. Used to trick the auto-column resizing to not
4314- // go below the icons
4313+ case 1: // action -- dummy text, not drawn. Used to trick the auto-column resizing to not
4314+ // go below the icons. Note this is required for Ctrl+ auto-resizing, manual auto-resizing
4315+ // could be handled in ResizeAllListCtrlCols().
43154316 if (pLogEntry)
4316- lstrcpyn(pItem->pszText, L"XXXXXXXXXXXXXXXX", pItem->cchTextMax - 1);
4317+ lstrcpyn(pItem->pszText, L"Action column"/*L"XXXXXXXXXXXXXXXX"*/, pItem->cchTextMax - 1);
43174318 break;
43184319 case 2: //author
43194320 if (pLogEntry)
--- branches/1.9.x/src/TortoiseProc/RepositoryBrowser.cpp (revision 27115)
+++ branches/1.9.x/src/TortoiseProc/RepositoryBrowser.cpp (revision 27116)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2015 - TortoiseSVN
3+// Copyright (C) 2003-2016 - 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
@@ -1170,8 +1170,8 @@
11701170
11711171 if (m_repository.root.IsEmpty())
11721172 return false;
1173-
1174- m_path = CTSVNPath(m_repository.root);
1173+ if (urlHasDifferentRoot)
1174+ m_path = CTSVNPath(m_repository.root);
11751175 CAppUtils::SetWindowTitle(m_hWnd, m_path.GetUIPathString(), m_origDlgTitle);
11761176 root = m_repository.root;
11771177
--- branches/1.9.x/src/TortoiseShell/ShellExt.h (revision 27115)
+++ branches/1.9.x/src/TortoiseShell/ShellExt.h (revision 27116)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2015 - TortoiseSVN
3+// Copyright (C) 2003-2016 - 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
@@ -188,7 +188,7 @@
188188
189189 static MenuInfo menuInfo[];
190190 FileState m_State;
191- ULONG m_cRef;
191+ volatile ULONG m_cRef;
192192 //std::map<int,std::string> verbMap;
193193 std::map<UINT_PTR, UINT_PTR> myIDMap;
194194 std::map<UINT_PTR, UINT_PTR> mySubMenuMap;
--- branches/1.9.x/src/Utils/MiscUI/SciEdit.cpp (revision 27115)
+++ branches/1.9.x/src/Utils/MiscUI/SciEdit.cpp (revision 27116)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2015 - TortoiseSVN
3+// Copyright (C) 2003-2016 - TortoiseSVN
44 // Copyright (C) 2015 - TortoiseGit
55
66 // This program is free software; you can redistribute it and/or
@@ -298,6 +298,8 @@
298298 Call(SCI_SETWRAPMODE, SC_WRAP_NONE);
299299 Call(SCI_SETEDGEMODE, EDGE_LINE);
300300 Call(SCI_SETEDGECOLUMN, props.nLogWidthMarker);
301+ Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
302+ Call(SCI_SETSCROLLWIDTH, 1);
301303 }
302304 else
303305 {
@@ -462,6 +464,9 @@
462464 CStringA sTextA = StringForControl(sText);
463465 Call(SCI_SETTEXT, 0, (LPARAM)(LPCSTR)sTextA);
464466
467+ if (Call(SCI_GETSCROLLWIDTHTRACKING) != 0)
468+ Call(SCI_SETSCROLLWIDTH, 1);
469+
465470 // Scintilla seems to have problems with strings that
466471 // aren't terminated by a newline char. Once that char
467472 // is there, it can be removed without problems.
--- branches/1.9.x/www/source/_includes/footer.html (revision 27115)
+++ branches/1.9.x/www/source/_includes/footer.html (revision 27116)
@@ -1,8 +1,8 @@
11 </div> <!-- .page -->
22
3- <div class="footer">
4- <p>&hearts; 2004-2015 &ndash; <span title="@@DATE">The TortoiseSVN team</span>. Please share.</p>
5- </div> <!-- .footer -->
3+ <div class="footer">
4+ <p>&hearts; 2004-2016 &ndash; <span title={{ site.time | date_to_xmlschema }}>The TortoiseSVN team</span>. Please share.</p>
5+ </div> <!-- .footer -->
66
77 </div> <!-- .wrapper -->
88
Show on old repository browser