Mercurial > hg > easyhg
comparison mainwindow.cpp @ 129:4986642800f0
* Initial work on showing uncommitted changes (as dashed box) in history graph
author | Chris Cannam |
---|---|
date | Mon, 29 Nov 2010 20:53:34 +0000 |
parents | fcaf09ee825d |
children | 9ae4cc0055e8 |
comparison
equal
deleted
inserted
replaced
128:fcaf09ee825d | 129:4986642800f0 |
---|---|
1244 case ACT_LOG_INCREMENTAL: | 1244 case ACT_LOG_INCREMENTAL: |
1245 hgTabs->addIncrementalLog(output); | 1245 hgTabs->addIncrementalLog(output); |
1246 break; | 1246 break; |
1247 | 1247 |
1248 case ACT_QUERY_PARENTS: | 1248 case ACT_QUERY_PARENTS: |
1249 { | |
1250 foreach (Changeset *cs, currentParents) delete cs; | 1249 foreach (Changeset *cs, currentParents) delete cs; |
1251 currentParents = Changeset::parseChangesets(output); | 1250 currentParents = Changeset::parseChangesets(output); |
1252 QStringList ids; | |
1253 foreach (Changeset *cs, currentParents) ids.push_back(cs->id()); | |
1254 hgTabs->setCurrent(ids); | |
1255 } | |
1256 break; | 1251 break; |
1257 | 1252 |
1258 case ACT_QUERY_HEADS: | 1253 case ACT_QUERY_HEADS: |
1259 foreach (Changeset *cs, currentHeads) delete cs; | 1254 foreach (Changeset *cs, currentHeads) delete cs; |
1260 currentHeads = Changeset::parseChangesets(output); | 1255 currentHeads = Changeset::parseChangesets(output); |
1505 } | 1500 } |
1506 } | 1501 } |
1507 hgMergeAct->setEnabled(localRepoActionsEnabled && canMerge); | 1502 hgMergeAct->setEnabled(localRepoActionsEnabled && canMerge); |
1508 hgUpdateAct->setEnabled(localRepoActionsEnabled && canUpdate); | 1503 hgUpdateAct->setEnabled(localRepoActionsEnabled && canUpdate); |
1509 | 1504 |
1505 QStringList ids; | |
1506 foreach (Changeset *cs, currentParents) ids.push_back(cs->id()); | |
1507 hgTabs->setCurrent(ids); | |
1508 hgTabs->showUncommittedChanges(hgTabs->canCommit()); | |
1509 | |
1510 // Set the state field on the file status widget | 1510 // Set the state field on the file status widget |
1511 | 1511 |
1512 QString branchText; | 1512 QString branchText; |
1513 if (currentBranch == "" || currentBranch == "default") { | 1513 if (currentBranch == "" || currentBranch == "default") { |
1514 branchText = tr("the default branch"); | 1514 branchText = tr("the default branch"); |