Changeset - 79ce82bdb06e
[Not reviewed]
stable
0 1 0
Mads Kiilerich (kiilerix) - 5 years ago 2020-05-10 18:04:17
mads@kiilerich.com
Grafted from: 48354b0ffddd
feeds: fix failure getting feed for Git repos (Issue #372)

GitChangeset.diff() did
return ''.join(self.repository.get_diff(...))
even though get_diff returned a string. It worked, but was unnecessary and
inefficient.

That fails in py3: get_diff returns bytes ... and iterating doesn't give
characters but integers and we would get:
TypeError: sequence item 0: expected a bytes-like object, int found

Fixed by dropping the unnecessary iteration and joining.

This function is only used for feeds statistics.
1 file changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general) First comment
kallithea/lib/vcs/backends/git/changeset.py
Show inline comments
 
@@ -231,9 +231,9 @@ class GitChangeset(BaseChangeset):
 
        # Only used to feed diffstat
 
        rev1 = self.parents[0] if self.parents else self.repository.EMPTY_CHANGESET
 
        rev2 = self
 
        return b''.join(self.repository.get_diff(rev1, rev2,
 
        return self.repository.get_diff(rev1, rev2,
 
                                    ignore_whitespace=ignore_whitespace,
 
                                    context=context))
 
                                    context=context)
 

	
 
    def get_file_mode(self, path):
 
        """
0 comments (0 inline, 0 general) First comment
You need to be logged in to comment. Login now