codeflash-ai/codeflash
1
0
Fork 0
Code Issues 18 Pull requests 33 Projects Releases Packages Wiki Activity Actions 2.3k

bug fix when pushing branch

Browse source
This commit is contained in:
Kevin Turcios 2025-07-29 15:29:53 -07:00
parent 5675ef08aa
commit 5c8fbf6d3a
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
codeflash/code_utils/git_utils.py
View file

@ -22,7 +22,9 @@ if TYPE_CHECKING:
from git import Repo
def get_git_diff(repo_directory: Path = Path.cwd(), uncommitted_changes: bool = False) -> dict[str, list[int]]: # noqa: B008, FBT001, FBT002
def get_git_diff(repo_directory: Path | None = None, *, uncommitted_changes: bool = False) -> dict[str, list[int]]:
if repo_directory is None:
repo_directory = Path.cwd()
repository = git.Repo(repo_directory, search_parent_directories=True)
commit = repository.head.commit
if uncommitted_changes:
@ -117,30 +119,31 @@ def confirm_proceeding_with_no_git_repo() -> str | bool:
return True
def check_and_push_branch(repo: git.Repo, git_remote: str | None = "origin", wait_for_push: bool = False) -> bool: # noqa: FBT001, FBT002
current_branch = repo.active_branch.name
def check_and_push_branch(repo: git.Repo, git_remote: str | None = "origin", *, wait_for_push: bool = False) -> bool:
current_branch = repo.active_branch
current_branch_name = current_branch.name
remote = repo.remote(name=git_remote)
# Check if the branch is pushed
if f"{git_remote}/{current_branch}" not in repo.refs:
logger.warning(f"⚠️ The branch '{current_branch}' is not pushed to the remote repository.")
if f"{git_remote}/{current_branch_name}" not in repo.refs:
logger.warning(f"⚠️ The branch '{current_branch_name}' is not pushed to the remote repository.")
if not sys.__stdin__.isatty():
logger.warning("Non-interactive shell detected. Branch will not be pushed.")
return False
if sys.__stdin__.isatty() and Confirm.ask(
f"⚡️ In order for me to create PRs, your current branch needs to be pushed. Do you want to push "
f"the branch '{current_branch}' to the remote repository?",
f"the branch '{current_branch_name}' to the remote repository?",
default=False,
):
remote.push(current_branch)
logger.info(f"⬆️ Branch '{current_branch}' has been pushed to {git_remote}.")
logger.info(f"⬆️ Branch '{current_branch_name}' has been pushed to {git_remote}.")
if wait_for_push:
time.sleep(3) # adding this to give time for the push to register with GitHub,
# so that our modifications to it are not rejected
return True
logger.info(f"🔘 Branch '{current_branch}' has not been pushed to {git_remote}.")
logger.info(f"🔘 Branch '{current_branch_name}' has not been pushed to {git_remote}.")
return False
logger.debug(f"The branch '{current_branch}' is present in the remote repository.")
logger.debug(f"The branch '{current_branch_name}' is present in the remote repository.")
return True