From f9ef39dcae0e3fba9ade05546b5359a83b63668d Mon Sep 17 00:00:00 2001 From: xcaliber Date: Thu, 15 Jan 2026 13:11:17 +0000 Subject: [PATCH] fix(dev.py): fix merge_pull_request output variable bug --- gitea/dev.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gitea/dev.py b/gitea/dev.py index 233f7b1..871dc9e 100644 --- a/gitea/dev.py +++ b/gitea/dev.py @@ -1,9 +1,9 @@ - def _get_branch(self, branch: Optional[str], __user__: dict = None) -> str: - """Get effective branch with priority resolution.""" - if branch: - return branch - if __user__ and "valves" in __user__: - user_valves = __user__.get("valves") if __user__ else None - if self.valves.ALLOW_USER_OVERRIDES and user_valves.USER_DEFAULT_BRANCH: - return user_valves.USER_DEFAULT_BRANCH - return self.valves.DEFAULT_BRANCH \ No newline at end of file + if merged: + output = f"**PR #{pr_number} Merged Successfully**\n\n" + output += f"**Strategy:** {merge_strategy.upper()}\n" + if commit_sha: + output += f"**Merge Commit:** `{commit_sha}`\n" + output += f"\n✅ The pull request has been merged into {owner}/{repo_name}." + return output + else: + return f"**PR #{pr_number} Merge Result:**\n\n{result}\n" \ No newline at end of file