feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Hg: Improve push/pull handling

Browse Source 
* Use paths/default-push and paths/default Urls as appropriate
* Read the settings from the project location except when the
  currently open file is not below that project directory.

  This makes things work for QTCREATORBUG-10261 without breaking
  .hgsubs (which are required to be children of the top-level
  repository.

Task-number: QTCREATORBUG-10261
Change-Id: Ie7cc4b9a420f17e27b69eae93fb9985e1a218d6e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-24 14:16:12 +01:00
parent c2803b00be
commit f6aba96197
3 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/mercurial/srcdestdialog.cpp
View File

@@ -38,9 +38,10 @@
using namespace VcsBase;
using namespace Mercurial::Internal;
SrcDestDialog::SrcDestDialog(QWidget *parent) :
SrcDestDialog::SrcDestDialog(Direction dir, QWidget *parent) :
QDialog(parent),
m_ui(new Ui::SrcDestDialog)
m_ui(new Ui::SrcDestDialog),
m_direction(dir)
{
m_ui->setupUi(this);
m_ui->localPathChooser->setExpectedKind(Utils::PathChooser::ExistingDirectory);
@@ -91,10 +92,28 @@ QString SrcDestDialog::getRepositoryString() const
return m_ui->urlLineEdit->text();
}
QString SrcDestDialog::workingDir() const
{
return m_workingdir;
}
QUrl SrcDestDialog::getRepoUrl() const
{
MercurialPlugin *plugin = MercurialPlugin::instance();
const VcsBasePluginState state = plugin->currentState();
QSettings settings(QString(QLatin1String("%1/.hg/hgrc")).arg(state.currentProjectPath()), QSettings::IniFormat);
return settings.value(QLatin1String("paths/default")).toUrl();
// Repo to use: Default to the project repo, but use the current
const QString projectLoc = state.currentProjectPath();
const QString fileLoc = state.currentFileTopLevel();
m_workingdir = projectLoc;
if (!fileLoc.isEmpty())
m_workingdir = fileLoc;
if (!projectLoc.isEmpty() && fileLoc.startsWith(projectLoc + QLatin1Char('/')))
m_workingdir = projectLoc;
QSettings settings(QString(QLatin1String("%1/.hg/hgrc")).arg(m_workingdir), QSettings::IniFormat);
QUrl url;
if (m_direction == outgoing)
url = settings.value(QLatin1String("paths/default-push")).toUrl();
if (url.isEmpty())
url = settings.value(QLatin1String("paths/default")).toUrl();
return url;
}