change option for controlling deduplication

deduplicate by default

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -250,7 +250,7 @@ bool CmdLineParser::fillSettingsFromArgs(int argc, const char* const argv[])
             fs.computeHash();
         }
 
-        if (mSettings.deduplicate) {
+        if (!mSettings.recheckProjectDuplicates) {
             auto it = fileSettings.begin();
             while (it != fileSettings.end()) {
                 fileSettings.erase(std::remove_if(std::next(it), fileSettings.end(), [&](const FileSettings& fs) {
@@ -651,8 +651,8 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
         else if (std::strcmp(argv[i], "--debug-clang-output") == 0)
             mSettings.debugClangOutput = true;
 
-        else if (std::strcmp(argv[i], "--deduplicate") == 0)
-            mSettings.deduplicate = true;
+        else if (std::strcmp(argv[i], "--recheck-project-duplicates") == 0)
+            mSettings.recheckProjectDuplicates = true;
 
         // Show debug messages for ignored files
         else if (std::strcmp(argv[i], "--debug-ignore") == 0)
@@ -1721,8 +1721,10 @@ void CmdLineParser::printHelp() const
         "                         be considered for evaluation.\n"
         "    --config-excludes-file=<file>\n"
         "                         A file that contains a list of config-excludes\n"
-        "    --deduplicate        Remove duplicate entries when reading project files.\n"
-        "                         Takes both compilation flags and filenames in to account.\n"
+        "    --recheck-project-duplicates\n"
+        "                         When using the --project option, files with identical\n"
+        "                         names and compiler flags are deduplicated by default.\n"
+        "                         This option forces cppcheck to check all imported files.\n"
         "    --disable=<id>       Disable individual checks.\n"
         "                         Please refer to the documentation of --enable=<id>\n"
         "                         for further details.\n"

lib/settings.h

@@ -220,8 +220,8 @@ class CPPCHECKLIB WARN_UNUSED Settings {
     /** @brief Do not filter duplicated errors. */
     bool emitDuplicates{};
 
-    /** @brief De-duplicate files with identical path and config. */
-    bool deduplicate{};
+    /** @brief Recheck project files with identical path and config. */
+    bool recheckProjectDuplicates{};
 
     /** @brief Name of the language that is enforced. Empty per default. */
     Standards::Language enforcedLang{};

man/cppcheck.1.xml

@@ -151,7 +151,7 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
         <option>--config-excludes-file=&lt;file&gt;</option>
       </arg>
       <arg choice="opt">
-        <option>--deduplicate</option>
+        <option>--recheck-project-duplicates</option>
       </arg>
       <arg choice="opt">
         <option>--include=&lt;file&gt;</option>
@@ -446,10 +446,10 @@ First given path is searched for contained header files first. If paths are rela
       </varlistentry>
       <varlistentry>
         <term>
-          <option>--deduplicate</option>
+          <option>--recheck-project-duplicates</option>
         </term>
         <listitem>
-          <para>Remove duplicate entries when reading project files. Takes both compilation flags and filenames in to account.</para>
+          <para>When using the --project option, files with identical names and compiler flags are deduplicated by default. This option forces cppcheck to check all imported files.</para>
         </listitem>
       </varlistentry>
       <varlistentry>