nas/ptools
1
0
Fork 0
mirror of https://github.com/ngfchl/ptools synced 2023-07-10 13:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化按分支（稳定、开发）获取更新信息

Browse Source
This commit is contained in:
ngfchl
2022-10-07 21:20:51 +08:00
parent eac3954493
commit eec28bf8b5
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
auto_pt/views.py
View File

@@ -1,5 +1,6 @@
import json
import logging
import os
import socket
import subprocess
import time
@@ -303,9 +304,18 @@ def get_update_logs():
# 拉取仓库更新记录元数据
repo.remote().update()
# 获取本地仓库commits更新记录
commits = list(repo.iter_commits('master', max_count=10))
branch = 'master'
if os.getenv('DEV'):
branch = os.getenv('DEV')
logger.info('当前分支')
logger.info(branch)
commits = list(repo.iter_commits(branch, max_count=10))
logger.info('本地记录')
logger.info(commits)
# 获取远程仓库commits记录
remote_commits = list(repo.iter_commits("origin/master", max_count=10))
remote_commits = list(repo.iter_commits("origin/" + branch, max_count=10))
logger.info('远程仓库更新记录')
logger.info(remote_commits)
return commits[0].hexsha == remote_commits[0].hexsha