Merged UpdateRevision into Update
Disabled unimplemented Remotes and Settings workspace items FossilOrigin-Name: a297f70942e3dccf9904c054fb9e633edb9c59cb
This commit is contained in:
kostas
parent
435d1571e7
commit
8afb6c280c
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
||||
C Renamed\sREPODIRMODEL_ROLE_PATH\sto\s\nRenamed\sTreeViewItem\sto\sWorkspaceItem\n
|
||||
D 2015-05-03T15:27:24.382
|
||||
C Merged\sUpdateRevision\sinto\sUpdate\nDisabled\sunimplemented\sRemotes\sand\sSettings\sworkspace\sitems
|
||||
D 2015-05-03T15:37:36.581
|
||||
F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
|
||||
F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
|
||||
F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
|
||||
@ -200,8 +200,8 @@ F src/Fossil.cpp f27b97eaf068275a0e8558dd2b739f9c7b61774a
|
||||
F src/Fossil.h f9b49ed930af2159f97a86ce0f6da821a0b0819e
|
||||
F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
|
||||
F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
|
||||
F src/MainWindow.cpp 0ac9252f14037dc8eb0533c51eec6d81b87c2705
|
||||
F src/MainWindow.h e6797adc543fd07a117a4eacc202fb166ec6665a
|
||||
F src/MainWindow.cpp 0a5183c05ff08b635cd9517182b2357240ea52be
|
||||
F src/MainWindow.h 725b4b5ed259029fd3de4bda65ca89f35c37e55e
|
||||
F src/RevisionDialog.cpp 51065c65a07c118dd1a7363da4a55a135d1c6c9c
|
||||
F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73
|
||||
F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
|
||||
@ -217,10 +217,10 @@ F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
|
||||
F ui/CloneDialog.ui 4886e7d4f258ea8b852b5eefc860396e35145712
|
||||
F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
|
||||
F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
|
||||
F ui/MainWindow.ui d4fc7971a0717677adb1be0bb88502dfcb92f5c4
|
||||
F ui/MainWindow.ui 9dd0f9ef3f486413c9af912ac557c0e7bf9c6f50
|
||||
F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
|
||||
F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
|
||||
P c179d505cea29fe7e6b9c1b149bbd46eb6a0b009
|
||||
R f645ada195980983be970129e402fce2
|
||||
P 07f3a4f2e0f2a67172434d4336bec1dea1fc5856
|
||||
R 99002beae8d92d0dad7136d0a700f184
|
||||
U kostas
|
||||
Z af9364389f462e204ab5f0db7259e8f2
|
||||
Z 062c1bdf7b6c35cfdeda74b3f8d3385e
|
||||
|
||||
@ -1 +1 @@
|
||||
07f3a4f2e0f2a67172434d4336bec1dea1fc5856
|
||||
a297f70942e3dccf9904c054fb9e633edb9c59cb
|
||||
@ -159,14 +159,14 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
|
||||
menuTags->addAction(ui->actionNewTag);
|
||||
menuTags->addAction(separator);
|
||||
menuTags->addAction(ui->actionDeleteTag);
|
||||
menuTags->addAction(ui->actionUpdateRevision);
|
||||
menuTags->addAction(ui->actionUpdate);
|
||||
|
||||
// BranchesMenu
|
||||
menuBranches = new QMenu(this);
|
||||
menuBranches->addAction(ui->actionNewBranch);
|
||||
menuBranches->addAction(separator);
|
||||
menuBranches->addAction(ui->actionMergeBranch);
|
||||
menuBranches->addAction(ui->actionUpdateRevision);
|
||||
menuBranches->addAction(ui->actionUpdate);
|
||||
|
||||
// Recent Workspaces
|
||||
// Locate a sequence of two separator actions in file menu
|
||||
@ -722,6 +722,7 @@ void MainWindow::updateWorkspaceView()
|
||||
stashes->appendRow(stash);
|
||||
}
|
||||
|
||||
#if 0 // Unimplemented for now
|
||||
// Remotes
|
||||
QStandardItem *remotes = new QStandardItem(QIcon(":icons/icons/Network PC-01.png"), "Remotes");
|
||||
remotes->setData(WorkspaceItem(WorkspaceItem::TYPE_REMOTES, ""), ROLE_WORKSPACE_ITEM);
|
||||
@ -733,8 +734,7 @@ void MainWindow::updateWorkspaceView()
|
||||
settings->setData(WorkspaceItem(WorkspaceItem::TYPE_SETTINGS, ""), ROLE_WORKSPACE_ITEM);
|
||||
settings->setEditable(false);
|
||||
getWorkspace().getDirModel().appendRow(settings);
|
||||
|
||||
|
||||
#endif
|
||||
ui->workspaceTreeView->expandToDepth(0);
|
||||
//ui->workspaceTreeView->sortByColumn(0, Qt::AscendingOrder);
|
||||
}
|
||||
@ -1468,33 +1468,6 @@ void MainWindow::on_actionAbout_triggered()
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
void MainWindow::on_actionUpdate_triggered()
|
||||
{
|
||||
QStringList res;
|
||||
|
||||
// Do test update
|
||||
if(!fossil().updateRepository(res, "", true))
|
||||
return;
|
||||
|
||||
if(res.length()==0)
|
||||
return;
|
||||
|
||||
QStringMap kv;
|
||||
ParseProperties(kv, res, ':');
|
||||
// If no changes exit
|
||||
if(kv.contains("changes") && kv["changes"].indexOf("None.")!=-1)
|
||||
return;
|
||||
|
||||
if(!FileActionDialog::run(this, tr("Update"), tr("The following files will be updated.")+"\n"+tr("Are you sure?"), res))
|
||||
return;
|
||||
|
||||
// Do update
|
||||
fossil().updateRepository(res, "", false);
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
void MainWindow::on_actionUpdateRevision_triggered()
|
||||
{
|
||||
QStringList selected = selectedBranches + selectedTags;
|
||||
|
||||
|
||||
@ -114,7 +114,6 @@ private slots:
|
||||
void on_textBrowser_customContextMenuRequested(const QPoint &pos);
|
||||
void on_fileTableView_customContextMenuRequested(const QPoint &pos);
|
||||
void on_workspaceTreeView_customContextMenuRequested(const QPoint &pos);
|
||||
void on_actionUpdateRevision_triggered();
|
||||
void on_actionNewTag_triggered();
|
||||
void on_actionDeleteTag_triggered();
|
||||
void on_actionNewBranch_triggered();
|
||||
|
||||
@ -293,7 +293,6 @@
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionCommit"/>
|
||||
<addaction name="actionUpdate"/>
|
||||
<addaction name="actionUpdateRevision"/>
|
||||
<addaction name="separator"/>
|
||||
<addaction name="actionPush"/>
|
||||
<addaction name="actionPull"/>
|
||||
@ -701,7 +700,7 @@
|
||||
<string>Update</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Update the workspace to the latest version</string>
|
||||
<string>Update the workspace to a revision</string>
|
||||
</property>
|
||||
<property name="statusTip">
|
||||
<string>Update the workspace to the latest version</string>
|
||||
@ -890,21 +889,6 @@
|
||||
<string>Diff Stash</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionUpdateRevision">
|
||||
<property name="icon">
|
||||
<iconset resource="../rsrc/resources.qrc">
|
||||
<normaloff>:/icons/icons/Button Forward-01.png</normaloff>:/icons/icons/Button Forward-01.png</iconset>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Update to Revision</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Update the workspace to a specific revision</string>
|
||||
</property>
|
||||
<property name="shortcut">
|
||||
<string>Ctrl+Shift+U</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionNewTag">
|
||||
<property name="icon">
|
||||
<iconset resource="../rsrc/resources.qrc">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user