OSDN > Trouver un logiciel > Développement de logiciels > Version Control > TortoiseSVN > SCM > SVN > Commit

TortoiseSVN Faire un don

tortoisesvn: Commit

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
2	2
3		-// Copyright (C) 2007-2010, 2012-2014 - TortoiseSVN
	3	+// Copyright (C) 2007-2010, 2012-2014, 2020 - TortoiseSVN
4	4
5	5	// This program is free software; you can redistribute it and/or
6	6	// modify it under the terms of the GNU General Public License

		@@ -78,11 +78,14 @@
78	78	}
79	79	if (!props.Add(bRecursive ? SVN_PROP_INHERITABLE_IGNORES : SVN_PROP_IGNORE, (LPCSTR)CUnicodeUtils::GetUTF8(value)))
80	80	{
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	+ }
86	89	err = TRUE;
87	90	break;
88	91	}

		@@ -98,15 +101,18 @@
98	101	}
99	102	if (err == FALSE)
100	103	{
101		- CString filelist;
102		- for (auto it = addeditems.cbegin(); it != addeditems.cend(); ++it)
	104	+ if (!parser.HasKey(L"noui"))
103	105	{
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);
106	115	}
107		- CString temp;
108		- temp.Format(bRecursive ? IDS_PROC_IGNORERECURSIVESUCCESS : IDS_PROC_IGNORESUCCESS, (LPCTSTR)filelist);
109		- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONINFORMATION);
110	116	return true;
111	117	}
112	118	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
2	2
3		-// Copyright (C) 2007-2010, 2012, 2014 - TortoiseSVN
	3	+// Copyright (C) 2007-2010, 2012, 2014, 2020 - TortoiseSVN
4	4
5	5	// This program is free software; you can redistribute it and/or
6	6	// modify it under the terms of the GNU General Public License

		@@ -70,9 +70,12 @@
70	70	{
71	71	if (!props.Remove(bRecursive ? SVN_PROP_INHERITABLE_IGNORES : SVN_PROP_IGNORE))
72	72	{
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	+ }
76	79	err = TRUE;
77	80	break;
78	81	}

		@@ -81,9 +84,12 @@
81	84	{
82	85	if (!props.Add(bRecursive ? SVN_PROP_INHERITABLE_IGNORES : SVN_PROP_IGNORE, (LPCSTR)CUnicodeUtils::GetUTF8(value)))
83	86	{
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	+ }
87	93	err = TRUE;
88	94	break;
89	95	}

		@@ -91,15 +97,18 @@
91	97	}
92	98	if (err == FALSE)
93	99	{
94		- CString filelist;
95		- for (auto it = removeditems.cbegin(); it != removeditems.cend(); ++it)
	100	+ if (!parser.HasKey(L"noui"))
96	101	{
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);
99	111	}
100		- CString temp;
101		- temp.Format(bRecursive ? IDS_PROC_UNIGNORERECURSIVESUCCESS : IDS_PROC_UNIGNORESUCCESS, (LPCTSTR)filelist);
102		- MessageBox(GetExplorerHWND(), temp, L"TortoiseSVN", MB_ICONINFORMATION);
103	112	return true;
104	113	}
105	114	return false;