• R/O
  • SSH
  • HTTPS

tortoisesvn: コミット


コミットメタ情報

リビジョン28881 (tree)
日時2020-05-23 15:06:05
作者stefankueng

ログメッセージ

Merged revision(s) r28880 from trunk:
* Add a /noui parameter for the (un)ignore command.

変更サマリ

差分

--- branches/1.14.x/src/TortoiseProc/Commands/IgnoreCommand.cpp (revision 28880)
+++ branches/1.14.x/src/TortoiseProc/Commands/IgnoreCommand.cpp (revision 28881)
@@ -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) 2007-2010, 2012-2014 - TortoiseSVN
3+// Copyright (C) 2007-2010, 2012-2014, 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
@@ -78,11 +78,14 @@
7878 }
7979 if (!props.Add(bRecursive ? SVN_PROP_INHERITABLE_IGNORES : SVN_PROP_IGNORE, (LPCSTR)CUnicodeUtils::GetUTF8(value)))
8080 {
81- CString temp;
82- temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
83- temp += L"\n";
84- temp += props.GetLastErrorMessage();
85- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONERROR);
81+ if (!parser.HasKey(L"noui"))
82+ {
83+ CString temp;
84+ temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
85+ temp += L"\n";
86+ temp += props.GetLastErrorMessage();
87+ MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONERROR);
88+ }
8689 err = TRUE;
8790 break;
8891 }
@@ -98,15 +101,18 @@
98101 }
99102 if (err == FALSE)
100103 {
101- CString filelist;
102- for (auto it = addeditems.cbegin(); it != addeditems.cend(); ++it)
104+ if (!parser.HasKey(L"noui"))
103105 {
104- filelist += *it;
105- filelist += L"\n";
106+ CString filelist;
107+ for (auto it = addeditems.cbegin(); it != addeditems.cend(); ++it)
108+ {
109+ filelist += *it;
110+ filelist += L"\n";
111+ }
112+ CString temp;
113+ temp.Format(bRecursive ? IDS_PROC_IGNORERECURSIVESUCCESS : IDS_PROC_IGNORESUCCESS, (LPCTSTR)filelist);
114+ MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONINFORMATION);
106115 }
107- CString temp;
108- temp.Format(bRecursive ? IDS_PROC_IGNORERECURSIVESUCCESS : IDS_PROC_IGNORESUCCESS, (LPCTSTR)filelist);
109- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONINFORMATION);
110116 return true;
111117 }
112118 return false;
--- branches/1.14.x/src/TortoiseProc/Commands/UnIgnoreCommand.cpp (revision 28880)
+++ branches/1.14.x/src/TortoiseProc/Commands/UnIgnoreCommand.cpp (revision 28881)
@@ -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) 2007-2010, 2012, 2014 - TortoiseSVN
3+// Copyright (C) 2007-2010, 2012, 2014, 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
@@ -70,9 +70,12 @@
7070 {
7171 if (!props.Remove(bRecursive ? SVN_PROP_INHERITABLE_IGNORES : SVN_PROP_IGNORE))
7272 {
73- CString temp;
74- temp.Format(IDS_ERR_FAILEDUNIGNOREPROPERTY, (LPCTSTR)name);
75- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONERROR);
73+ if (!parser.HasKey(L"noui"))
74+ {
75+ CString temp;
76+ temp.Format(IDS_ERR_FAILEDUNIGNOREPROPERTY, (LPCTSTR)name);
77+ MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONERROR);
78+ }
7679 err = TRUE;
7780 break;
7881 }
@@ -81,9 +84,12 @@
8184 {
8285 if (!props.Add(bRecursive ? SVN_PROP_INHERITABLE_IGNORES : SVN_PROP_IGNORE, (LPCSTR)CUnicodeUtils::GetUTF8(value)))
8386 {
84- CString temp;
85- temp.Format(IDS_ERR_FAILEDUNIGNOREPROPERTY, (LPCTSTR)name);
86- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONERROR);
87+ if (!parser.HasKey(L"noui"))
88+ {
89+ CString temp;
90+ temp.Format(IDS_ERR_FAILEDUNIGNOREPROPERTY, (LPCTSTR)name);
91+ MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONERROR);
92+ }
8793 err = TRUE;
8894 break;
8995 }
@@ -91,15 +97,18 @@
9197 }
9298 if (err == FALSE)
9399 {
94- CString filelist;
95- for (auto it = removeditems.cbegin(); it != removeditems.cend(); ++it)
100+ if (!parser.HasKey(L"noui"))
96101 {
97- filelist += *it;
98- filelist += L"\n";
102+ CString filelist;
103+ for (auto it = removeditems.cbegin(); it != removeditems.cend(); ++it)
104+ {
105+ filelist += *it;
106+ filelist += L"\n";
107+ }
108+ CString temp;
109+ temp.Format(bRecursive ? IDS_PROC_UNIGNORERECURSIVESUCCESS : IDS_PROC_UNIGNORESUCCESS, (LPCTSTR)filelist);
110+ MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONINFORMATION);
99111 }
100- CString temp;
101- temp.Format(bRecursive ? IDS_PROC_UNIGNORERECURSIVESUCCESS : IDS_PROC_UNIGNORESUCCESS, (LPCTSTR)filelist);
102- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONINFORMATION);
103112 return true;
104113 }
105114 return false;
旧リポジトリブラウザで表示