From 1663b7a18874683310bd926c6d7fd367abb61c50 Mon Sep 17 00:00:00 2001 From: Pavel Gromov Date: Mon, 4 Dec 2023 15:51:37 +0100 Subject: [PATCH] [gitlab] Rename value GitOrigin-RevId: c23927d2908ea7b025d98ed24a22f225b668fb48 --- .../ui/create/model/GitLabMergeRequestCreateViewModel.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt index e10b7835c3d2..5785611b856e 100644 --- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt +++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/create/model/GitLabMergeRequestCreateViewModel.kt @@ -106,8 +106,8 @@ internal class GitLabMergeRequestCreateViewModelImpl( }?.iid } - override val commits: SharedFlow>?> = branchState.transformLatest { model -> - if (model == null) { + override val commits: SharedFlow>?> = branchState.transformLatest { state -> + if (state == null) { emit(Result.success(emptyList())) return@transformLatest } @@ -117,8 +117,8 @@ internal class GitLabMergeRequestCreateViewModelImpl( runCatchingUser { GitLogUtil.collectMetadata( project, - model.headRepo.gitRepository.root, - "${model.baseBranch.name}..${model.headBranch.name}" + state.headRepo.gitRepository.root, + "${state.baseBranch.name}..${state.headBranch.name}" ).commits } }