mirror of
https://github.com/Dictionarry-Hub/profilarr.git
synced 2026-01-23 11:11:11 +01:00
34 lines
1.3 KiB
Python
34 lines
1.3 KiB
Python
# git/status/incoming_changes.py
|
|
|
|
import os
|
|
import logging
|
|
from .utils import extract_data_from_yaml, determine_type
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
def get_incoming_changes(repo, branch):
|
|
incoming_changes = []
|
|
diff = repo.git.diff(f'HEAD...origin/{branch}', name_only=True)
|
|
changed_files = diff.split('\n') if diff else []
|
|
|
|
for file_path in changed_files:
|
|
if file_path:
|
|
full_path = os.path.join(repo.working_dir, file_path)
|
|
file_data = extract_data_from_yaml(full_path) if os.path.exists(full_path) else None
|
|
|
|
# Correcting the git show command
|
|
commit_message = repo.git.show(f'HEAD...origin/{branch}', '--format=%B', '-s', file_path).strip()
|
|
|
|
incoming_changes.append({
|
|
'name': file_data.get('name', os.path.basename(file_path)) if file_data else os.path.basename(file_path),
|
|
'id': file_data.get('id') if file_data else None,
|
|
'type': determine_type(file_path),
|
|
'status': 'Incoming',
|
|
'file_path': file_path,
|
|
'commit_message': commit_message, # Include commit message here
|
|
'staged': False,
|
|
'modified': True,
|
|
'deleted': False
|
|
})
|
|
|
|
return incoming_changes |