From dc9de44c24e3df7714789cff595e57808c87ff33 Mon Sep 17 00:00:00 2001 From: jack1142 <6032823+jack1142@users.noreply.github.com> Date: Sat, 7 Aug 2021 06:05:39 +0200 Subject: [PATCH 1/3] Make the message made by `cherry_picker --continue` same as regular --- cherry_picker/cherry_picker.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py index 48baef5..a28f315 100755 --- a/cherry_picker/cherry_picker.py +++ b/cherry_picker/cherry_picker.py @@ -258,9 +258,7 @@ def get_exit_message(self, branch): $ cherry_picker --abort """ - def amend_commit_message(self, cherry_pick_branch): - """ prefix the commit message with (X.Y) """ - + def get_updated_commit_message(self, cherry_pick_branch): commit_prefix = "" if self.prefix_commit: commit_prefix = f"[{get_base_branch(cherry_pick_branch)}] " @@ -269,6 +267,11 @@ def amend_commit_message(self, cherry_pick_branch): Co-authored-by: {get_author_info_from_short_sha(self.commit_sha1)}""" + + def amend_commit_message(self, cherry_pick_branch): + """ prefix the commit message with (X.Y) """ + + updated_commit_message = self.get_updated_commit_message(cherry_pick_branch) if self.dry_run: click.echo(f" dry-run: git commit --amend -m '{updated_commit_message}'") else: @@ -451,16 +454,8 @@ def continue_cherry_pick(self): short_sha = cherry_pick_branch[ cherry_pick_branch.index("-") + 1 : cherry_pick_branch.index(base) - 1 ] - full_sha = get_full_sha_from_short(short_sha) - commit_message = self.get_commit_message(short_sha) - co_author_info = ( - f"Co-authored-by: {get_author_info_from_short_sha(short_sha)}" - ) - updated_commit_message = f"""[{base}] {commit_message}. -(cherry picked from commit {full_sha}) - - -{co_author_info}""" + self.commit_sha1 = get_full_sha_from_short(short_sha) + updated_commit_message = self.get_updated_commit_message(cherry_pick_branch) if self.dry_run: click.echo( f" dry-run: git commit -a -m '{updated_commit_message}' --allow-empty" From cba30d8e2f3b4646db4dc352809e0bfbf3fa5996 Mon Sep 17 00:00:00 2001 From: jack1142 <6032823+jack1142@users.noreply.github.com> Date: Sat, 7 Aug 2021 18:51:55 +0200 Subject: [PATCH 2/3] Add missing return --- cherry_picker/cherry_picker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cherry_picker/cherry_picker.py b/cherry_picker/cherry_picker.py index a28f315..55f3838 100755 --- a/cherry_picker/cherry_picker.py +++ b/cherry_picker/cherry_picker.py @@ -262,7 +262,7 @@ def get_updated_commit_message(self, cherry_pick_branch): commit_prefix = "" if self.prefix_commit: commit_prefix = f"[{get_base_branch(cherry_pick_branch)}] " - updated_commit_message = f"""{commit_prefix}{self.get_commit_message(self.commit_sha1)} + return f"""{commit_prefix}{self.get_commit_message(self.commit_sha1)} (cherry picked from commit {self.commit_sha1}) From 89e1db630de5d14690a8c1d703fa6dbe9c18d231 Mon Sep 17 00:00:00 2001 From: jack1142 <6032823+jack1142@users.noreply.github.com> Date: Sat, 7 Aug 2021 21:17:58 +0200 Subject: [PATCH 3/3] Mock the new higher-level method instead of lower-level ones --- cherry_picker/test.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cherry_picker/test.py b/cherry_picker/test.py index 5eb271f..e80629f 100644 --- a/cherry_picker/test.py +++ b/cherry_picker/test.py @@ -831,11 +831,14 @@ def test_backport_pause_and_continue( ), mock.patch( "cherry_picker.cherry_picker.get_current_branch", return_value="backport-xxx-3.8", - ), mock.patch( - "cherry_picker.cherry_picker.get_author_info_from_short_sha", - return_value="Author Name ", ), mock.patch.object( - cherry_picker, "get_commit_message", return_value="commit message" + cherry_picker, + "get_updated_commit_message", + return_value="""[3.8] commit message +(cherry picked from commit xxxxxxyyyyyy) + + +Co-authored-by: Author Name """, ), mock.patch.object( cherry_picker, "checkout_branch" ), mock.patch.object(