File size: 1,337 Bytes
1d409a9 |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 |
import os
import sys
root = os.path.dirname(os.path.abspath(__file__))
sys.path.append(root)
os.chdir(root)
try:
import pygit2
pygit2.option(pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0)
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)
repo.head.set_target(remote_commit.id)
repo.checkout_tree(repo.get(remote_commit.id))
repo.reset(local_branch.target, pygit2.GIT_RESET_HARD)
print("Fast-forward merge")
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
print("Update failed - Did you modify any file?")
except Exception as e:
print('Update failed.')
print(str(e))
print('Update succeeded.')
from launch import *
|