From fb58f8c04f0e88a89649796717de4743cfeab9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Ga=C4=87e=C5=A1a?= Date: Wed, 18 Sep 2024 12:25:58 +0000 Subject: [PATCH] feat: [CODE-2380]: add error message to rebase api (#2701) * add error message to rebase api --- app/api/controller/repo/rebase.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/api/controller/repo/rebase.go b/app/api/controller/repo/rebase.go index 4f59601a8..436af84f1 100644 --- a/app/api/controller/repo/rebase.go +++ b/app/api/controller/repo/rebase.go @@ -99,7 +99,10 @@ func (c *Controller) Rebase( } if protection.IsCritical(violations) { - return nil, &types.MergeViolations{RuleViolations: violations}, nil + return nil, &types.MergeViolations{ + RuleViolations: violations, + Message: protection.GenerateErrorMessageForBlockingViolations(violations), + }, nil } readParams := git.CreateReadParams(repo) @@ -162,10 +165,11 @@ func (c *Controller) Rebase( return nil, nil, fmt.Errorf("rebase execution failed: %w", err) } - if mergeOutput.MergeSHA.String() == "" || len(mergeOutput.ConflictFiles) > 0 { + if mergeOutput.MergeSHA.IsEmpty() || len(mergeOutput.ConflictFiles) > 0 { return nil, &types.MergeViolations{ ConflictFiles: mergeOutput.ConflictFiles, RuleViolations: violations, + Message: fmt.Sprintf("Rebase blocked by conflicting files: %v", mergeOutput.ConflictFiles), }, nil }