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

[KiRi] Renamed the branch option 

- Now called revision
- It is in fact a *revision-range*
This commit is contained in:
Salvador E. Tropea 2023-12-29 13:19:32 -03:00
parent 2a8c699908
commit 33bd72073b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kibot/out_kiri.py
View File

@ -64,8 +64,9 @@ class KiRiOptions(VariantOptions):
""" Color used for the background of the diff canvas """ """ Color used for the background of the diff canvas """
self.max_commits = 0 self.max_commits = 0
""" Maximum number of commits to include. Use 0 for all available commits """ """ Maximum number of commits to include. Use 0 for all available commits """
self.branch = 'HEAD' self.revision = 'HEAD'
""" Branch to use for the commits """ """ Starting point for the commits, can be a branch, a hash, etc.
Note that this can be a revision-range, consult the gitrevisions manual for more information """
self.keep_generated = False self.keep_generated = False
""" *Avoid PCB and SCH images regeneration. Useful for incremental usage """ """ *Avoid PCB and SCH images regeneration. Useful for incremental usage """
super().__init__() super().__init__()
@ -199,9 +200,9 @@ class KiRiOptions(VariantOptions):
f.write((GS.pcb_title or 'No title')+'|'+(GS.pcb_rev or '')+'|'+(GS.pcb_date or today)+'\n') f.write((GS.pcb_title or 'No title')+'|'+(GS.pcb_rev or '')+'|'+(GS.pcb_date or today)+'\n')
def get_modified_status(self, pcb_file, sch_files): def get_modified_status(self, pcb_file, sch_files):
res = self.run_git(['log', '--pretty=format:%H', self.branch] + self._max_commits + ['--', pcb_file]) res = self.run_git(['log', '--pretty=format:%H', self.revision] + self._max_commits + ['--', pcb_file])
self.commits_with_changed_pcb = set(res.split()) self.commits_with_changed_pcb = set(res.split())
res = self.run_git(['log', '--pretty=format:%H', self.branch] + self._max_commits + ['--'] + sch_files) res = self.run_git(['log', '--pretty=format:%H', self.revision] + self._max_commits + ['--'] + sch_files)
self.commits_with_changed_sch = set(res.split()) self.commits_with_changed_sch = set(res.split())
if GS.debug_level > 1: if GS.debug_level > 1:
logger.debug(f'Commits with changes in the PCB: {self.commits_with_changed_pcb}') logger.debug(f'Commits with changes in the PCB: {self.commits_with_changed_pcb}')
@ -283,7 +284,7 @@ class KiRiOptions(VariantOptions):
# Get a list of hashes where we have changes # Get a list of hashes where we have changes
self._max_commits = ['-n', str(self.max_commits)] if self.max_commits else [] self._max_commits = ['-n', str(self.max_commits)] if self.max_commits else []
cmd = ['log', "--date=format:%Y-%m-%d %H:%M:%S", '--pretty=format:%H | %ad | %an | %s'] cmd = ['log', "--date=format:%Y-%m-%d %H:%M:%S", '--pretty=format:%H | %ad | %an | %s']
res = self.run_git(cmd + self._max_commits + [self.branch, '--', GS.pcb_file] + sch_files) res = self.run_git(cmd + self._max_commits + [self.revision, '--', GS.pcb_file] + sch_files)
hashes = [r.split(' | ') for r in res.split('\n')] hashes = [r.split(' | ') for r in res.split('\n')]
# Ensure we have at least 2 # Ensure we have at least 2
sch_dirty = self.git_dirty(GS.sch_file) sch_dirty = self.git_dirty(GS.sch_file)