From 647c65c96e91d79202f3261b818559389baf5de8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 5 Nov 2013 20:47:10 +0200 Subject: Git: Suggest mergetool on stash restore conflicts Removed warning popup, but stderr is still visible in Version Control pane Change-Id: I6f5779f0382b8ead1e7140eb6ad533ea0c91dcc2 Reviewed-by: Petar Perisin --- src/plugins/git/gitclient.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'src/plugins/git/gitclient.cpp') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index ac047f0ac7..dfc9e7af16 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -3529,26 +3529,14 @@ void GitClient::stashPop(const QString &workingDirectory) bool GitClient::synchronousStashRestore(const QString &workingDirectory, const QString &stash, bool pop, - const QString &branch /* = QString()*/, - QString *errorMessage) + const QString &branch /* = QString()*/) { QStringList arguments(QLatin1String("stash")); if (branch.isEmpty()) arguments << QLatin1String(pop ? "pop" : "apply") << stash; else arguments << QLatin1String("branch") << branch << stash; - QByteArray outputText; - QByteArray errorText; - const bool rc = fullySynchronousGit(workingDirectory, arguments, &outputText, &errorText, - VcsBasePlugin::ExpectRepoChanges); - if (rc) { - const QString output = commandOutputFromLocal8Bit(outputText); - if (!output.isEmpty()) - outputWindow()->append(output); - } else { - msgCannotRun(arguments, workingDirectory, errorText, errorMessage); - } - return rc; + return executeAndHandleConflicts(workingDirectory, arguments); } bool GitClient::synchronousStashRemove(const QString &workingDirectory, -- cgit v1.2.1 From 4442a92729f17db4f47a4458894298487952109c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 11 Nov 2013 22:20:47 +0200 Subject: Braces cleanup Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk --- src/plugins/git/gitclient.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/git/gitclient.cpp') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index dfc9e7af16..693375039d 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -537,9 +537,8 @@ QString GitDiffHandler::workingTreeContents(const QString &fileName) const QString absoluteFileName = workingDir.absoluteFilePath(fileName); QFile file(absoluteFileName); - if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) return m_editor->editorWidget()->codec()->toUnicode(file.readAll()); - } return QString(); } -- cgit v1.2.1