mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2025-10-31 13:02:54 +00:00
Code Issues Releases Wiki Activity

Fix restore_snapshot() choking on timestamps before initial commit

Browse Source
This commit is contained in:
Kristóf Tóth
2018-08-03 11:55:51 +02:00
parent 3d2e3e7db3
commit e383be0149
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tfw/components/snapshot_provider.py
View File

@@ -129,13 +129,24 @@ class SnapshotProvider:
self._checkout(commit) self._checkout(commit)
def _get_commit_from_timestamp(self, date): def _get_commit_from_timestamp(self, date):
return self._get_stdout(( commit = self._get_stdout((
'git', 'rev-list', 'git', 'rev-list',
'--date=iso', '--date=iso',
'-n', '1', '-n', '1',
f'--before="{date.isoformat()}"', f'--before="{date.isoformat()}"',
self._last_valid_branch self._last_valid_branch
)) ))
if not commit:
commit = self._get_oldest_parent_of_head()
return commit
def _get_oldest_parent_of_head(self):
return self._get_stdout((
'git',
'rev-list',
'--max-parents=0',
'HEAD'
))
@property @property
def _last_valid_branch(self): def _last_valid_branch(self):