sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-15 08:47:20 +08:00
Code Activity

Refactor: Gitpython preparations

Browse Source
This commit is contained in:
LmeSzinc
2025-09-02 00:59:07 +08:00
parent f65c0c17e9
commit 8c4a9600e6
15 changed files with 17 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
deploy/git_over_cdn/client.py
View File

@@ -204,7 +204,7 @@ class GitOverCdnClient:
self.logger.warning(f'TimeoutExpired when calling {cmd}, stdout={stdout}, stderr={stderr}')
return stdout.decode()
def git_reset(self, keep_changes=False):
def git_reset(self):
"""
git reset --hard <commit>
"""
@@ -217,12 +217,7 @@ class GitOverCdnClient:
if os.path.exists(lock_file):
self.logger.info(f'Lock file {lock_file} exists, removing')
os.remove(lock_file)
if keep_changes:
self.git_command('stash')
self.git_command('reset', '--hard', f'{self.source}/{self.branch}')
self.git_command('stash', 'pop')
else:
self.git_command('reset', '--hard', f'{self.source}/{self.branch}')
self.git_command('reset', '--hard', f'{self.source}/{self.branch}')
def get_status(self):
"""
@@ -245,11 +240,8 @@ class GitOverCdnClient:
self.logger.info('Current repo is behind remote')
return 'behind'
def update(self, keep_changes=False):
def update(self):
"""
Args:
keep_changes:
Returns:
bool: If repo is up-to-date
"""
@@ -263,13 +255,13 @@ class GitOverCdnClient:
return False
if self.current_commit == self.latest_commit:
self.logger.info('Already up to date')
self.git_reset(keep_changes=keep_changes)
self.git_reset()
return True
if not self.download_pack():
return False
if not self.update_refs():
return False
self.git_reset(keep_changes=keep_changes)
self.git_reset()
self.logger.info('Update success')
return True