Skip to content

Commit

Permalink
Bug handle untracked files #6 (#8)
Browse files Browse the repository at this point in the history
* Remove whitespace

* #6 Handle untracked files in github
  • Loading branch information
arunn authored Apr 28, 2017
1 parent 5cee50a commit c82a682
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
13 changes: 13 additions & 0 deletions git_diff_lines.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,23 @@ def __init__(self):
return None

def get_diff_lines(self, file_name):
is_untracked_file, line_numbers = self.get_untracked_file_line_numbers(file_name)
if is_untracked_file:
return line_numbers
normal_diff_line_numbers = self.get_diff(file_name, "")
staged_diff_line_numbers = self.get_diff(file_name, "--cached")
return normal_diff_line_numbers + staged_diff_line_numbers

def get_untracked_file_line_numbers(self, file_name):
p=subprocess.Popen(shlex.split("git ls-files --others --exclude-standard"),
shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=Utils.current_project_folder())
out = p.communicate()[0].decode('utf-8')
relative_file_name = file_name.replace(Utils.current_project_folder() + '/','')
if relative_file_name not in out.splitlines():
return (False, [])
num_lines = sum(1 for line in open(file_name))
return (True, list(range(1, num_lines + 1)))

def get_diff(self, file_name, options):
p=subprocess.Popen(shlex.split("git diff --unified=0 --no-ext-diff "+ options + " '"+ file_name +"'"),
shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=Utils.current_project_folder())
Expand Down
4 changes: 1 addition & 3 deletions utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,4 @@ def get_offense_diff(rubocop_offenses, diff_line_numbers):
diff_offenses[line].append(offense['message'])
else:
diff_offenses[line] = [offense['message']]
return diff_offenses


return diff_offenses

0 comments on commit c82a682

Please sign in to comment.