4598: There was an error displaying this diff

slog2

What version are you running?

2.5.16

What's the URL of the page containing the problem?

/r/101/diff/2#index_header

What steps will reproduce the problem?

  1. Create a new review request with SVN diff file
  2. Open the diff tab

What is the expected output? What do you see instead?

Some files diff are not showing with this error
-> There was an error displaying this diff.

I think this problem is related with SVN file encoding

What operating system are you using? What browser?

Windows 10, Chrome

Please provide any additional information below.

     There was an error displaying this diff.


    The patch to 'branches/ss-mds/web/common/chart.cls.php' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.W7wEsH' for debugging purposes.
`patch` returned: 



     This may be a bug in the software, a temporary outage, or an issue
     with the format of your diff.





     Please try again, and if you still have trouble,
     contact support.








    Details




    Traceback (most recent call last):
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/views.py", line 300, in get
    response = renderer.render_to_response(request)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/renderers.py", line 56, in render_to_response
    return HttpResponse(self.render_to_string(request))
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/renderers.py", line 74, in render_to_string
    large_data=True)
  File "/usr/lib/python2.6/site-packages/Djblets-0.9.9-py2.6.egg/djblets/cache/backend.py", line 298, in cache_memoize
    compress_large_data))
  File "/usr/lib/python2.6/site-packages/Djblets-0.9.9-py2.6.egg/djblets/cache/backend.py", line 252, in cache_memoize_iter
    items = items_or_callable()
  File "/usr/lib/python2.6/site-packages/Djblets-0.9.9-py2.6.egg/djblets/cache/backend.py", line 295, in <lambda>
    lambda: [lookup_callable()],
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/renderers.py", line 73, in <lambda>
    lambda: self.render_to_string_uncached(request),
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/renderers.py", line 87, in render_to_string_uncached
    request=request)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 669, in populate_diff_chunks
    chunks = list(generator.get_chunks())
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/chunk_generator.py", line 786, in get_chunks
    for chunk in super(DiffChunkGenerator, self).get_chunks(cache_key):
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/chunk_generator.py", line 107, in get_chunks
    large_data=True)
  File "/usr/lib/python2.6/site-packages/Djblets-0.9.9-py2.6.egg/djblets/cache/backend.py", line 298, in cache_memoize
    compress_large_data))
  File "/usr/lib/python2.6/site-packages/Djblets-0.9.9-py2.6.egg/djblets/cache/backend.py", line 252, in cache_memoize_iter
    items = items_or_callable()
  File "/usr/lib/python2.6/site-packages/Djblets-0.9.9-py2.6.egg/djblets/cache/backend.py", line 295, in <lambda>
    lambda: [lookup_callable()],
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/chunk_generator.py", line 106, in <lambda>
    lambda: list(self.get_chunks_uncached()),
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/chunk_generator.py", line 793, in get_chunks_uncached
    new = get_patched_file(old, self.filediff, self.request)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 233, in get_patched_file
    return patch(diff, buffer, filediff.dest_file, request)
  File "/usr/lib/python2.6/site-packages/ReviewBoard-2.5.16-py2.6.egg/reviewboard/diffviewer/diffutils.py", line 169, in patch
    'output': stderr,
Exception: The patch to 'branches/ss-mds/web/common/chart.cls.php' didn't apply cleanly. The temporary files have been left in '/tmp/reviewboard.W7wEsH' for debugging purposes.
`patch` returned: 
david
#1 david

You'll need to look at the rejects listed in the temporary directory to help debug what's going wrong. If you can attach them here that's even more helpful to us (but don't include any proprietary information--this is a public server).

  • -New
    +NeedInfo