Mirror
/
gitinspector
mirror of https://github.com/ejwa/gitinspector.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

guard against exceptions when commits is None due to extension filtering

This commit is contained in:
Chuck Durfee 2017-04-18 12:34:45 -06:00
parent 6e538ffaa7
commit a723313691
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gitinspector/changes.py
View File

@ -160,9 +160,10 @@ class ChangesThread(threading.Thread):
filtering.set_filtered(commit.sha, "message")):
is_filtered = True
if FileDiff.is_filediff_line(j) and not \
filtering.set_filtered(FileDiff.get_filename(j)) and not is_filtered:
extensions.add_located(FileDiff.get_extension(j))
if commit is not None:
if FileDiff.is_filediff_line(j) and not \
filtering.set_filtered(FileDiff.get_filename(j)) and not is_filtered:
extensions.add_located(FileDiff.get_extension(j))
if FileDiff.is_valid_extension(j):
found_valid_extension = True
@ -198,18 +199,14 @@ class Changes(object):
first_hash = ""
for i, entry in enumerate(lines):
if i % CHANGES_PER_THREAD == CHANGES_PER_THREAD - 1:
entry = entry.decode("utf-8", "replace").strip()
second_hash = entry
ChangesThread.create(hard, self, first_hash, second_hash, i)
first_hash = entry + ".."
if format.is_interactive_format():
terminal.output_progress(progress_text, i, len(lines))
else:
entry = entry.decode("utf-8", "replace").strip()
second_hash = entry
ChangesThread.create(hard, self, first_hash, second_hash, i)
if i % CHANGES_PER_THREAD == CHANGES_PER_THREAD - 1:
first_hash = entry + ".."
if format.is_interactive_format():
terminal.output_progress(progress_text, i, len(lines))
# Make sure all threads have completed.
for i in range(0, NUM_THREADS):
@ -220,15 +217,22 @@ class Changes(object):
__thread_lock__.release()
self.commits = [item for sublist in self.commits for item in sublist]
flatten = lambda l: [item for sublist in l for item in sublist]
self.commits = [x for x in flatten(self.commits) if x is not None]
if len(self.commits) > 0:
if interval.has_interval() and len(self.commits) > 0:
interval.set_ref(self.commits[-1].sha)
if self.commits:
first = self.commits[0]
last = self.commits[-1]
self.first_commit_date = datetime.date(int(self.commits[0].date[0:4]), int(self.commits[0].date[5:7]),
int(self.commits[0].date[8:10]))
self.last_commit_date = datetime.date(int(self.commits[-1].date[0:4]), int(self.commits[-1].date[5:7]),
int(self.commits[-1].date[8:10]))
if first and last:
if interval.has_interval() and last:
interval.set_ref(last.sha)
self.first_commit_date = self.get_commit_date(first)
self.last_commit_date = self.get_commit_date(last)
@classmethod
def get_commit_date(cls, commit):
return datetime.date(int(commit.date[0:4]), int(commit.date[5:7]), int(commit.date[8:10]))
def __iadd__(self, other):
try: