forked from qt-creator/qt-creator
FileListDiffController: Don't set startupFile()
We didn't do that before. We did it only for ShowController.
Amends cbcfc0242e
Change-Id: I6ba68bdb6b16204bcc66bdfd63bf7457c713ac28
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
@@ -244,7 +244,6 @@ private:
|
|||||||
};
|
};
|
||||||
|
|
||||||
const auto onStagingDynamicSetup = [this] {
|
const auto onStagingDynamicSetup = [this] {
|
||||||
setStartupFile(VcsBase::source(document()));
|
|
||||||
QSet<int> config;
|
QSet<int> config;
|
||||||
if (!m_stagedFiles.isEmpty())
|
if (!m_stagedFiles.isEmpty())
|
||||||
config.insert(0);
|
config.insert(0);
|
||||||
@@ -336,7 +335,6 @@ Tasking::Group ShowController::reloadRecipe()
|
|||||||
|
|
||||||
const auto setupDescription = [this](QtcProcess &process) {
|
const auto setupDescription = [this](QtcProcess &process) {
|
||||||
process.setCodec(m_instance->encoding(workingDirectory(), "i18n.commitEncoding"));
|
process.setCodec(m_instance->encoding(workingDirectory(), "i18n.commitEncoding"));
|
||||||
setStartupFile(VcsBase::source(this->document()));
|
|
||||||
setupCommand(process, {"show", "-s", noColorOption, showFormatC, m_id});
|
setupCommand(process, {"show", "-s", noColorOption, showFormatC, m_id});
|
||||||
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
|
VcsOutputWindow::appendCommand(process.workingDirectory(), process.commandLine());
|
||||||
setDescription(Tr::tr("Waiting for data..."));
|
setDescription(Tr::tr("Waiting for data..."));
|
||||||
@@ -485,6 +483,7 @@ Tasking::Group ShowController::reloadRecipe()
|
|||||||
const Group root {
|
const Group root {
|
||||||
Storage(storage),
|
Storage(storage),
|
||||||
parallel,
|
parallel,
|
||||||
|
OnGroupSetup([this] { setStartupFile(VcsBase::source(document())); }),
|
||||||
Group {
|
Group {
|
||||||
optional,
|
optional,
|
||||||
Process(setupDescription, onDescriptionDone),
|
Process(setupDescription, onDescriptionDone),
|
||||||
|
Reference in New Issue
Block a user