Mercurial > hg > easyhg
changeset 73:a773c6e7b301
* Make stat work regardless of which tab is selected
author | Chris Cannam |
---|---|
date | Thu, 18 Nov 2010 18:08:18 +0000 |
parents | 121cb1032717 |
children | 10eb97683aa9 |
files | mainwindow.cpp |
diffstat | 1 files changed, 21 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/mainwindow.cpp Thu Nov 18 17:36:53 2010 +0000 +++ b/mainwindow.cpp Thu Nov 18 18:08:18 2010 +0000 @@ -128,26 +128,23 @@ void MainWindow::hgStat() { - if (hgStatAct -> isEnabled()) + if (runningAction == ACT_NONE) { - if (runningAction == ACT_NONE) + QStringList params; + + QString statFlags = hgExp -> getStatFlags(); + if (statFlags.isEmpty()) { - QStringList params; - - QString statFlags = hgExp -> getStatFlags(); - if (statFlags.isEmpty()) - { - params << "stat"; - } - else - { - params << "stat" << "-" + statFlags; - } - - - runner -> startHgCommand(workFolderPath, params); - runningAction = ACT_STAT; + params << "stat"; } + else + { + params << "stat" << "-" + statFlags; + } + + + runner -> startHgCommand(workFolderPath, params); + runningAction = ACT_STAT; } } @@ -729,9 +726,14 @@ QString arg = d->getArgument().trimmed(); if (choice == "local") { + DEBUG << "open " << arg << endl; workFolderPath = arg; + remoteRepoPath = ""; } else if (choice == "remote") { DEBUG << "clone " << arg << " to " << d->getAdditionalArgument().trimmed() << endl; + //!!! check that work folder does not exist, append to it if it does + } else if (choice == "init") { + DEBUG << "init " << arg << endl; //!!! } @@ -1226,12 +1228,12 @@ hgIncomingAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled); hgPullAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled); hgPushAct -> setEnabled(remoteRepoActionsEnabled && remoteRepoActionsEnabled); - +/* if (tabPage != WORKTAB) { localRepoActionsEnabled = false; } - +*/ hgInitAct -> setEnabled((localRepoExist == false) && (workFolderExist==true)); hgStatAct -> setEnabled(localRepoActionsEnabled); hgFileDiffAct -> setEnabled(localRepoActionsEnabled);