comparison mainwindow.cpp @ 41:94bbc4b30b2a

Handle filenames starting with "-"

Such filenames are mistaken for command line options, unless we tell
Mercurial to stop processing command line options with the special
"--" option.

         if (!currentFile.isEmpty())
         {
             if (QMessageBox::Ok == QMessageBox::warning(this, "Remove file", "Really remove file " + currentFile.mid(2) + "?",
                 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))
             {
-                params << "remove" << "--after" << "--force" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
+                params << "remove" << "--after" << "--force" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 
                 runner -> startProc(getHgBinaryName(), workFolderPath, params);
                 runningAction = ACT_REMOVE;
             }
         }

         QStringList params;
         QString currentFile = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
-            params << "annotate" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
+            params << "annotate" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 
             runner -> startProc(getHgBinaryName(), workFolderPath, params);
             runningAction = ACT_ANNOTATE;
         }
     }

         QStringList params;
         QString currentFile = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
-            params << "resolve" << "--mark" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
+            params << "resolve" << "--mark" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 
             runner -> startProc(getHgBinaryName(), workFolderPath, params);
             runningAction = ACT_RESOLVE_MARK;
         }
     }

         QString currentFile = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
             //Diff parent file against working folder file
-            params << "kdiff3" << currentFile.mid(2);
+            params << "kdiff3" << "--" << currentFile.mid(2);
             runner -> startProc(getHgBinaryName(), workFolderPath, params, false);
             runningAction = ACT_FILEDIFF;
         }
     }
 }

     if (runningAction == ACT_NONE)
     {
         QStringList params;
         QString currentFile = hgExp -> getCurrentFileListLine();
 
-        params << "revert" << "--no-backup" << currentFile.mid(2);
+        params << "revert" << "--no-backup" << "--" << currentFile.mid(2);
 
         runner -> startProc(getHgBinaryName(), workFolderPath, params);
         runningAction = ACT_REVERT;
     }
 }