ttygroup
/
gertty
Code Issues Proposed changes

Merge "Have git not colorize output for diffs"

This commit is contained in:
Jenkins 2014-09-05 20:10:00 +00:00 committed by Gerrit Code Review
parent 3e23dbad0f f2aacf177a
commit 7d5b02d9af
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gertty/gitrepo.py
View File

@ -269,7 +269,7 @@ class Repo(object):
def diffstat(self, old, new):
repo = git.Repo(self.path)
diff = repo.git.diff('-M', '--numstat', old, new)
diff = repo.git.diff('-M', '--color=never', '--numstat', old, new)
ret = []
for x in diff.split('\n'):
# Added, removed, filename
@ -362,7 +362,8 @@ class Repo(object):
else:
extra_contexts.append(CommitContext(None, newc))
contexts = itertools.chain(
extra_contexts, oldc.diff(newc, create_patch=True, U=context))
extra_contexts, oldc.diff(
newc, color='never',create_patch=True, U=context))
for diff_context in contexts:
# Each iteration of this is a file
f = DiffFile()