templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Diff] Added some logic to support new='' 

- Pretends to be HEAD
- Detects if we have a dirty state

Related to #276
This commit is contained in:
Salvador E. Tropea 2022-09-06 10:12:10 -03:00
parent fe9bf9e18b
commit 947542747f
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
kibot/out_diff.py
View File

@ -222,8 +222,13 @@ class DiffOptions(BaseOptions):
name = user_name
else:
name = branch
if user_name == 'Dirty':
name += '-dirty'
return '{}({})'.format(self.run_git(['rev-parse', '--short', 'HEAD']), name)
def git_dirty(self):
return self.run_git(['status', '--porcelain', '-uno'])
def cache_git(self, name):
self.stashed = False
self.checkedout = False
@ -237,27 +242,30 @@ class DiffOptions(BaseOptions):
# Place where we know we have a repo
self.repo_dir = os.path.dirname(os.path.abspath(self.file))
try:
# Save current changes
logger.debug('Saving current changes')
self.run_git(['stash', 'push', '-m', STASH_MSG])
self.stashed = True
# Also save the submodules
self.run_git(['submodule', 'foreach', 'git stash push -m '+STASH_MSG])
# Find the current branch
self.branch = self.run_git(['rev-parse', '--abbrev-ref', 'HEAD'])
if self.branch == 'HEAD':
# Detached
self.branch = self.run_git(['rev-parse', 'HEAD'])
logger.debug('Current branch is '+self.branch)
# Checkout the target
name_ori = name
name = self.solve_git_name(name)
logger.debug('Changing to '+name)
ops = ['checkout']
if self.force_checkout:
ops.append('--force')
self.run_git(ops+['--recurse-submodules', name])
self.checkedout = True
if name:
# Save current changes
logger.debug('Saving current changes')
self.run_git(['stash', 'push', '-m', STASH_MSG])
self.stashed = True
# Also save the submodules
self.run_git(['submodule', 'foreach', 'git stash push -m '+STASH_MSG])
# Find the current branch
self.branch = self.run_git(['rev-parse', '--abbrev-ref', 'HEAD'])
if self.branch == 'HEAD':
# Detached
self.branch = self.run_git(['rev-parse', 'HEAD'])
logger.debug('Current branch is '+self.branch)
# Checkout the target
name_ori = name
name = self.solve_git_name(name)
logger.debug('Changing to '+name)
ops = ['checkout']
if self.force_checkout:
ops.append('--force')
self.run_git(ops+['--recurse-submodules', name])
self.checkedout = True
else:
name_ori = 'Dirty' if self.git_dirty() else 'HEAD'
# A short version of the current hash
self.git_hash = self.get_git_point_desc(name_ori)
# Populate the cache