From ad0814195abe78e1f73878288884dbc85f7344f0 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 4 Feb 2023 23:26:33 -0800 Subject: [PATCH] gitcmds: add a hint to the cherry-pick error message Signed-off-by: David Aguilar --- cola/gitcmds.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cola/gitcmds.py b/cola/gitcmds.py index eadd48c7..f1fcd188 100644 --- a/cola/gitcmds.py +++ b/cola/gitcmds.py @@ -888,7 +888,11 @@ def cherry_pick(context, revs): for rev in revs: status, out, err = context.git.cherry_pick(rev) if status != 0: - output = '# git cherry-pick %s\n\n%s' % (rev, out) + details = N_( + 'Hint: The "Actions > Abort Cherry-Pick" menu action can be used to ' + 'cancel the current cherry-pick.' + ) + output = '# git cherry-pick %s\n# %s\n\n%s' % (rev, details, out) return (status, output, err) outs.append(out) errs.append(err) -- 2.11.4.GIT