comparison mainwindow.cpp @ 91:879af4608c5e

* Remove some old code in preparation for rebuilding it with the newer structure

 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
         
-        QString statFlags = hgExp -> getStatFlags();
-        if (statFlags.isEmpty())
-        {
-            params << "stat";
-        }
-        else
-        {
-            params << "stat" << "-" + statFlags;
-        }
-        
+        params << "stat" << "-ardum";
         
         runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_STAT;
     }
 }

 void MainWindow::hgRemove()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
-        QString currentFile = hgExp -> getCurrentFileListLine();
+        QString currentFile;//!!! = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
             if (QMessageBox::Ok == QMessageBox::warning(this, "Remove file", "Really remove file " + currentFile.mid(2) + "?",
                 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel))

 void MainWindow::hgAnnotate()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
-        QString currentFile = hgExp -> getCurrentFileListLine();
+        QString currentFile;//!!! = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
             params << "annotate" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 

 void MainWindow::hgResolveMark()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
-        QString currentFile = hgExp -> getCurrentFileListLine();
+        QString currentFile;//!!! = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
             params << "resolve" << "--mark" << "--" << currentFile.mid(2);   //Jump over status marker characters (e.g "M ")
 

 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
 
-        QString currentFile = hgExp -> getCurrentFileListLine();
-
+        QString currentFile;//!!! = hgExp -> getCurrentFileListLine();
+/*!!!
         if (areAllSelectedUntracked(hgExp -> workFolderFileList))
         {
             //User wants to add selected file(s)
             params << "add" << "--";
 

             params << "add";
         }
 
         runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_ADD;
+    */
     }
 }
 
 bool MainWindow::getCommentOrTag(QString& commentOrTag,
                                  QString question,

         
         if (getCommentOrTag(comment, tr("Comment:"), tr("Save (commit)")))
         {
             if (!comment.isEmpty())
             {
+                /*!!!
                 if ((justMerged == false) && (areAllSelectedCommitable(hgExp -> workFolderFileList)))
                 {
                     //User wants to commit selected file(s) (and this is not merge commit, which would fail if we selected files)
                     params << "commit" << "--message" << comment << "--user" << getUserInfo() << "--";
 

                     params << "commit" << "--message" << comment << "--user" << getUserInfo();
                 }
 
                 runner -> startHgCommand(workFolderPath, params);
                 runningAction = ACT_COMMIT;
+                */
             }
         }
     }
 }
 

 void MainWindow::hgFileDiff()
 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
-
+/*!!!
         QString currentFile = hgExp -> getCurrentFileListLine();
 
         if (!currentFile.isEmpty())
         {
             //Diff parent file against working folder file
             params << "kdiff3" << "--" << currentFile.mid(2);
             runner -> startHgCommand(workFolderPath, params);
             runningAction = ACT_FILEDIFF;
         }
+    */
     }
 }
 
 
 void MainWindow::hgFolderDiff()

         QStringList params;
 
         //Diff 2 history log versions against each other
         QString revA;
         QString revB;
-
+/*!!!
         hgExp -> getHistoryDiffRevisions(revA, revB);
 
         if ((!revA.isEmpty()) && (!revB.isEmpty()))
         {
             params << "kdiff3" << "--rev" << revA << "--rev" << revB;

         }
         else
         {
             QMessageBox::information(this, tr("Changeset diff"), tr("Please select two changesets from history list or heads list first."));
         }
+        */
     }
 }
 
 
 

 {
     if (runningAction == ACT_NONE)
     {
         QStringList params;
         QString rev;
-
+/*!!!
         hgExp -> getUpdateToRevRevision(rev);
 
         hgExp -> setCurrentIndex(WORKTAB);
         enableDisableActions();
 
         params << "update" << "--rev" << rev << "--clean";
 
         runner -> startHgCommand(workFolderPath, params);
 
         runningAction = ACT_UPDATE;
+        */
     }
 }
 
 
 void MainWindow::hgRevert()
 {
     if (runningAction == ACT_NONE)
     {
+        /*!!!
         QStringList params;
         QString currentFile = hgExp -> getCurrentFileListLine();
 
         params << "revert" << "--no-backup" << "--" << currentFile.mid(2);
 
         runner -> startHgCommand(workFolderPath, params);
         runningAction = ACT_REVERT;
+        */
     }
 }
 
 void MainWindow::hgRetryMerge()
 {

             } else if (choice == "init") {
                 result = openInit(arg);
             }
 
             if (result) {
-                hgExp->clearLists();
                 enableDisableActions();
                 hgPaths();
-                done = true;            }
+                done = true;
+            }
 
         } else {
 
             // cancelled
             done = true;

                         enableDisableActions();
                         shouldHgStat = true;
                         break;
 
                     case ACT_LOG:
-                        {
-                            hgExp -> updateLocalRepoHgLogList(runner -> getOutput());
-                        }
+                        hgExp -> updateLocalRepoHgLogList(runner -> getOutput());
                         break;
 
                     case ACT_PARENTS:
                         {
-                            hgExp -> updateLocalRepoParentsList(runner -> getOutput());
+                        //!!!    hgExp -> updateLocalRepoParentsList(runner -> getOutput());
                         }
                         break;
 
                     case ACT_HEADS:
                         {
                             QString stdOut = runner -> getOutput();
-                            hgExp -> updateLocalRepoHeadsList(stdOut);
+                        //!!!    hgExp -> updateLocalRepoHeadsList(stdOut);
                         }
                         break;
 
                     case ACT_REMOVE:
                     case ACT_ADD:

     hgAnnotateAct -> setEnabled(localRepoActionsEnabled);
     hgServeAct -> setEnabled(localRepoActionsEnabled);
     hgTagAct -> setEnabled(localRepoActionsEnabled);
     hgIgnoreAct -> setEnabled(localRepoActionsEnabled);
 
-    hgExp -> enableDisableOtherTabs(tabPage);
+    //!!!hgExp -> enableDisableOtherTabs(tabPage);
 
     DEBUG << "localRepoActionsEnabled = " << localRepoActionsEnabled << endl;
     DEBUG << "canCommit = " << hgExp->canCommit() << endl;
 
     //!!! new stuff:

     settings.setValue("pos", pos());
     settings.setValue("size", size());
     settings.setValue("remoterepopath", remoteRepoPath);
     settings.setValue("workfolderpath", workFolderPath);
     settings.setValue("firststart", firstStart);
-    settings.setValue("viewFileTypes", hgExp -> getFileTypesBits());
-}
-
-
-
-
+    //!!!settings.setValue("viewFileTypes", hgExp -> getFileTypesBits());
+}
+
+
+
+