Mercurial > hg > easyhg
diff mainwindow.cpp @ 91:879af4608c5e
* Remove some old code in preparation for rebuilding it with the newer structure
author | Chris Cannam |
---|---|
date | Tue, 23 Nov 2010 21:04:02 +0000 |
parents | b43355c2473a |
children | 44ed7766d55a |
line wrap: on
line diff
--- a/mainwindow.cpp Tue Nov 23 16:35:49 2010 +0000 +++ b/mainwindow.cpp Tue Nov 23 21:04:02 2010 +0000 @@ -137,16 +137,7 @@ { 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; @@ -212,7 +203,7 @@ if (runningAction == ACT_NONE) { QStringList params; - QString currentFile = hgExp -> getCurrentFileListLine(); + QString currentFile;//!!! = hgExp -> getCurrentFileListLine(); if (!currentFile.isEmpty()) { @@ -233,7 +224,7 @@ if (runningAction == ACT_NONE) { QStringList params; - QString currentFile = hgExp -> getCurrentFileListLine(); + QString currentFile;//!!! = hgExp -> getCurrentFileListLine(); if (!currentFile.isEmpty()) { @@ -251,7 +242,7 @@ if (runningAction == ACT_NONE) { QStringList params; - QString currentFile = hgExp -> getCurrentFileListLine(); + QString currentFile;//!!! = hgExp -> getCurrentFileListLine(); if (!currentFile.isEmpty()) { @@ -285,8 +276,8 @@ { QStringList params; - QString currentFile = hgExp -> getCurrentFileListLine(); - + QString currentFile;//!!! = hgExp -> getCurrentFileListLine(); +/*!!! if (areAllSelectedUntracked(hgExp -> workFolderFileList)) { //User wants to add selected file(s) @@ -308,6 +299,7 @@ runner -> startHgCommand(workFolderPath, params); runningAction = ACT_ADD; + */ } } @@ -366,6 +358,7 @@ { 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) @@ -386,6 +379,7 @@ runner -> startHgCommand(workFolderPath, params); runningAction = ACT_COMMIT; + */ } } } @@ -463,7 +457,7 @@ if (runningAction == ACT_NONE) { QStringList params; - +/*!!! QString currentFile = hgExp -> getCurrentFileListLine(); if (!currentFile.isEmpty()) @@ -473,6 +467,7 @@ runner -> startHgCommand(workFolderPath, params); runningAction = ACT_FILEDIFF; } + */ } } @@ -500,7 +495,7 @@ //Diff 2 history log versions against each other QString revA; QString revB; - +/*!!! hgExp -> getHistoryDiffRevisions(revA, revB); if ((!revA.isEmpty()) && (!revB.isEmpty())) @@ -513,6 +508,7 @@ { QMessageBox::information(this, tr("Changeset diff"), tr("Please select two changesets from history list or heads list first.")); } + */ } } @@ -540,7 +536,7 @@ { QStringList params; QString rev; - +/*!!! hgExp -> getUpdateToRevRevision(rev); hgExp -> setCurrentIndex(WORKTAB); @@ -551,6 +547,7 @@ runner -> startHgCommand(workFolderPath, params); runningAction = ACT_UPDATE; + */ } } @@ -559,6 +556,7 @@ { if (runningAction == ACT_NONE) { + /*!!! QStringList params; QString currentFile = hgExp -> getCurrentFileListLine(); @@ -566,6 +564,7 @@ runner -> startHgCommand(workFolderPath, params); runningAction = ACT_REVERT; + */ } } @@ -767,10 +766,10 @@ } if (result) { - hgExp->clearLists(); enableDisableActions(); hgPaths(); - done = true; } + done = true; + } } else { @@ -1361,21 +1360,19 @@ 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; @@ -1569,7 +1566,7 @@ hgTagAct -> setEnabled(localRepoActionsEnabled); hgIgnoreAct -> setEnabled(localRepoActionsEnabled); - hgExp -> enableDisableOtherTabs(tabPage); + //!!!hgExp -> enableDisableOtherTabs(tabPage); DEBUG << "localRepoActionsEnabled = " << localRepoActionsEnabled << endl; DEBUG << "canCommit = " << hgExp->canCommit() << endl; @@ -1890,7 +1887,7 @@ settings.setValue("remoterepopath", remoteRepoPath); settings.setValue("workfolderpath", workFolderPath); settings.setValue("firststart", firstStart); - settings.setValue("viewFileTypes", hgExp -> getFileTypesBits()); + //!!!settings.setValue("viewFileTypes", hgExp -> getFileTypesBits()); }