Bug 1707: Optionally fail synchronization in scripting when there are no changes

https://winscp.net/tracker/1707

Source commit: 1942fab95bf18d13fd50dcc18661da5ac2ff19ff

source/core/Script.cpp

@@ -830,14 +830,8 @@ UnicodeString __fastcall TScript::ListingSysErrorMessage()
   return Result;
 }
 //---------------------------------------------------------------------------
-void __fastcall TScript::NoMatch(const UnicodeString & Mask, const UnicodeString & Error)
+void __fastcall TScript::NoMatch(const UnicodeString & Message)
 {
-  UnicodeString Message = FMTLOAD(SCRIPT_MATCH_NO_MATCH, (Mask));
-  if (!Error.IsEmpty())
-  {
-    Message += FORMAT(L" (%s)", (Error));
-  }
-
   if (FFailOnNoMatch)
   {
     throw Exception(Message);
@@ -848,6 +842,17 @@ void __fastcall TScript::NoMatch(const UnicodeString & Mask, const UnicodeString
   }
 }
 //---------------------------------------------------------------------------
+void __fastcall TScript::NoMatch(const UnicodeString & Mask, const UnicodeString & Error)
+{
+  UnicodeString Message = FMTLOAD(SCRIPT_MATCH_NO_MATCH, (Mask));
+  if (!Error.IsEmpty())
+  {
+    Message += FORMAT(L" (%s)", (Error));
+  }
+
+  NoMatch(Message);
+}
+//---------------------------------------------------------------------------
 void __fastcall TScript::FreeFiles(TStrings * FileList)
 {
   for (int i = 0; i < FileList->Count; i++)
@@ -1998,7 +2003,7 @@ void __fastcall TScript::SynchronizeProc(TScriptProcParams * Parameters)
       }
       else
       {
-        PrintLine(LoadStr(SCRIPT_SYNCHRONIZE_NODIFFERENCE));
+        NoMatch(LoadStr(SCRIPT_SYNCHRONIZE_NODIFFERENCE));
       }
     }
     __finally

source/core/Script.h

@@ -169,6 +169,7 @@ protected:
     bool Local);
   UnicodeString __fastcall ListingSysErrorMessage();
   void __fastcall NoMatch(const UnicodeString & Mask, const UnicodeString & Error);
+  void __fastcall NoMatch(const UnicodeString & Message);
 
 private:
   void __fastcall Init();