Mercurial > hg > easyhg
comparison src/mainwindow.cpp @ 642:b16e8ef6919b
Back out commit:5dc24f8 and instead move the extensions setting to its own tab (allowing us to provide a bit more information about what it's for)
author | Chris Cannam |
---|---|
date | Fri, 19 Oct 2012 12:08:11 +0100 |
parents | 91b7ad45c608 |
children | ae67ea0af696 e2f6bb97cc22 005b4530c6ee |
comparison
equal
deleted
inserted
replaced
641:b29b9694cd0d | 642:b16e8ef6919b |
---|---|
2086 (this, | 2086 (this, |
2087 tr("Failed to run Mercurial"), | 2087 tr("Failed to run Mercurial"), |
2088 tr("Failed to run Mercurial with extension enabled"), | 2088 tr("Failed to run Mercurial with extension enabled"), |
2089 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem.<br><br>You may be able to continue working if you switch off “Use EasyHg Mercurial Extension” in %1. Note that remote repositories that require authentication might not work if you do this.").arg(setstr), | 2089 tr("The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem.<br><br>You may be able to continue working if you switch off “Use EasyHg Mercurial Extension” in %1. Note that remote repositories that require authentication might not work if you do this.").arg(setstr), |
2090 stdErr); | 2090 stdErr); |
2091 settings(SettingsDialog::PathsTab); | 2091 settings(SettingsDialog::ExtensionsTab); |
2092 return; | 2092 return; |
2093 case ACT_CLONEFROMREMOTE: | 2093 case ACT_CLONEFROMREMOTE: |
2094 // if clone fails, we have no repo | 2094 // if clone fails, we have no repo |
2095 m_workFolderPath = ""; | 2095 m_workFolderPath = ""; |
2096 enableDisableActions(); | 2096 enableDisableActions(); |