diff --git a/entry_with_update.py b/entry_with_update.py new file mode 100644 index 0000000..31890ea --- /dev/null +++ b/entry_with_update.py @@ -0,0 +1,35 @@ +try: + + import pygit2 + import os + + repo = pygit2.Repository(os.path.abspath(os.path.dirname(__file__))) + + branch_name = repo.head.shorthand + + remote_name = 'origin' + remote = repo.remotes[remote_name] + + remote.fetch() + + local_branch_ref = f'refs/heads/{branch_name}' + local_branch = repo.lookup_reference(local_branch_ref) + + remote_reference = f'refs/remotes/{remote_name}/{branch_name}' + remote_commit = repo.revparse_single(remote_reference) + + merge_result, _ = repo.merge_analysis(remote_commit.id) + + if merge_result & pygit2.GIT_MERGE_ANALYSIS_UP_TO_DATE: + print("Already up-to-date") + elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD: + local_branch.set_target(remote_commit.id) + print("Fast-forward merge") + elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL: + print("Update failed - Did you modified any file?") +except Exception as e: + print('Update failed.') + print(str(e)) + +print('Update succeeded.') +from launch import *