Skip to content

Add support for diffing against root commit #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 19, 2016
Merged

Add support for diffing against root commit #408

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9ae1f21
Pass through the $HOME env var to the tox env
nvie Apr 12, 2016
83156b9
Add Python 3.5 env
nvie Apr 12, 2016
5de21c7
Support "root" as a special value in .diff() calls
nvie Apr 12, 2016
aae2a73
Fix comment
nvie Apr 14, 2016
82b533f
Use a special object rather than a string
nvie Apr 14, 2016
07b124c
Update changelog for next release
nvie Apr 14, 2016
c042f56
Export NULL_TREE
nvie Apr 14, 2016
1875885
Fix test cases
nvie Apr 14, 2016
6bdaa46
Drop dependency on six
nvie Apr 14, 2016
28afef5
Perform diff-tree recursively to have the same output as diff
nvie Apr 14, 2016
722473e
Remove Python 2.6 hack
nvie Apr 19, 2016
3297fe5
Merge remote-tracking branch 'upstream/master'
nvie Apr 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion git/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ def safe_decode(s):
return s
elif isinstance(s, six.binary_type):
if PRE_PY27:
return s.decode(defenc) # we're screwed
# Python 2.6 does not support the `errors` argument, so we cannot
# control the replacement of unsafe chars in it.
return s.decode(defenc)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw, @Byron, do you still want to keep supporting Python 2.6? This message is echoed when you run the Python 2.6 tests already:

py26 installed: DEPRECATION: Python 2.6 is no longer supported by the Python core team, please upgrade your Python. A future version of pip will drop support for Python 2.6

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for letting me know - under these circumstances it will be fine to drop support !

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just removed py2.6 support.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cheers! 👍

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW: I was about to merge a few PRs, but work is ...catching up earlier than expected. Will try again tonight, and if these delays become unbearable to you, I'd love to make you a collaborator. Just let me know what you think.
Cheers :) !

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No worries, I've been there. Maintaining OSS libraries while also getting work done is a hard balance to strike. On the plus side, patching/maintaining this project is important for our team now, and we're committed to only invest in it more. So if you'd like to have a contributor on board, I'd be more than happy to help out there!

else:
return s.decode(defenc, errors='replace')
raise TypeError('Expected bytes or text, but got %r' % (s,))
Expand Down