Use diff long options and uncap GitPython
GitPython had a very incompatible change that breaks any call that uses a single character option (e.g., -U) that requires no space between the option and the value. So far, this breaks the diff API where we used the -U option instead of the long option equivalent. For history: https://github.com/gitpython-developers/GitPython/issues/382 So far, I've only seen one place where this bites gertty. Since the GitPython author has stated this will not be reverted or fixed, having a permanent cap on that library seems harsh as we won't get any other bug fixes. This fixes the known/found areas where we are affected. Change-Id: Iadb279234af2ea01fbff35dc629c01dae5a3195c
This commit is contained in:
parent
b33cbc0a7a
commit
06957db1ed
@ -388,7 +388,7 @@ class Repo(object):
|
||||
extra_contexts.append(CommitContext(None, newc))
|
||||
contexts = itertools.chain(
|
||||
extra_contexts, oldc.diff(
|
||||
newc, color='never',create_patch=True, U=context))
|
||||
newc, color='never', create_patch=True, unified=context))
|
||||
for diff_context in contexts:
|
||||
# Each iteration of this is a file
|
||||
f = DiffFile()
|
||||
|
@ -2,7 +2,7 @@ pbr>=0.11,<2.0
|
||||
|
||||
urwid>=1.2.1,!=1.3.0
|
||||
SQLAlchemy>=1.0.4
|
||||
GitPython>=0.3.7,<1.0.2
|
||||
GitPython>=0.3.7
|
||||
python-dateutil
|
||||
requests>=2.5.3,<3.0.0
|
||||
ordereddict
|
||||
|
Loading…
x
Reference in New Issue
Block a user