From eb6a2f2b895c2a946815755eddf543a6d3755126 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 25 Sep 2020 17:24:51 +0300 Subject: Git: Enable Show for file in a specified revision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTCREATORBUG-24689 Change-Id: Ic4ceb1c59f39009c28be7f34ee62f65fd41506c1 Reviewed-by: André Hartmann --- src/plugins/git/gitclient.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/plugins/git/gitclient.h') diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 293f6f4a27..ce4638d38e 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -366,7 +366,11 @@ public: static QString suggestedLocalBranchName( const QString &workingDirectory, const QStringList &existingLocalNames, const QString &target, BranchTargetType targetType); - static void addChangeActions(QMenu *menu, const QString &workingDir, const QString &change); + static void addChangeActions(QMenu *menu, const QString &source, const QString &change); + static QString fileWorkingDirectory(const QString &file); + enum class ShowEditor { OnlyIfDifferent, Always }; + Core::IEditor *openShowEditor(const QString &workingDirectory, const QString &ref, + const QString &path, ShowEditor showSetting = ShowEditor::Always); private: void finishSubmoduleUpdate(); -- cgit v1.2.1