fix is_branch_with_unpushed_commits

renatav commented 6 months ago

Description (e.g. "Related to ...", etc.)

This bug was introduced by unreleased changes, which made it impossible to run update after cloning in cases where there are authenticated commits that do not get merged. The check needs to be more complex than just checking if top commits are the same.

Fix #414

Code review checklist (for code reviewer to complete)

[ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR)
[ ] Title summarizes what is changing
[ ] Commit messages are meaningful (see this for details)
[ ] Tests have been included and/or updated, as appropriate
[ ] Docstrings have been included and/or updated, as appropriate
[ ] Changelog has been updated, as needed (see CHANGELOG.md)

renatav commented 6 months ago

@n-dusan I added a test, and it's passing locally, but failing on CI. I don't know why. Would require debugging. It does not appear to be failing due to an error with this updated function

n-dusan commented 6 months ago

It's failing on my Windows locally.

Looks like repo can't find the local git branch name?

local_branch = repo.branches.get(branch_name)
        if local_branch is None:
            print(f"Branch '{branch_name}' not found in the repository.")
upstream_full_name = local_branch.upstream_name

E AttributeError: 'NoneType' object has no attribute 'upstream_name'

renatav commented 5 months ago

@n-dusan So it turned out that .default_branch was returning renatav/fix-clean-checks and not master. That caused the tests to fail. I have never experienced any problems with default_branch until now. The tests are passing now.

openlawlibrary / taf

fix is_branch_with_unpushed_commits #415

Description (e.g. "Related to ...", etc.)

Code review checklist (for code reviewer to complete)