Hi, Sorry, missed the previous e-mail.
On Perforce, we actually use 'diff' itself to determine if it's a binary file. We do this by running diff on the old file and the new modified file. If it tells us that it's a binary file, then we mark it as such, but otherwise we treat it as a plain text file and include it. It sounds like this is failing, and that there's just enough in there to make it think it's a text file. It sounds like we need better checking here. I don't know if we can query whether it's a binary file or not from Perforce easily enough, but if we can, then you should be able to patch post-review to do this check first and not attempt the diff. Christian -- Christian Hammond - chip...@chipx86.com Review Board - http://www.reviewboard.org VMware, Inc. - http://www.vmware.com On Tue, Feb 2, 2010 at 1:23 PM, Kunjal <kunjal.par...@gmail.com> wrote: > Any info. on this one? > > Thanks ! > > On Jan 26, 6:50 pm, Kunjal <kunjal.par...@gmail.com> wrote: > > Hello Chris, > > > > With RB 1.0.5.1, when someone post the review with 1 binary file + 1 > > txt file, RB should filter out the binary file but txt file should be > > able to get reviewed in RB. > > > > We are getting below message when the user look at the RB web after > > posting review. > > > > When I test RB, I could post review with few binary files + few text > > file and it filter out binary files correctly. > > Why this issue re-surfacing now? Does it depend on type of file? The > > files we have are called .spr file and they are marked as BINARY in > > perforce. > > > > The patch to 'C:/Builds/Mobcom/sysDev/21331/MMI_2/msp/stack/hedge/sdt/ > > usimap.spr' didn't apply cleanly. The temporary files have been left > > in '/tmp/reviewboard.GAdWou' for debugging purposes. `patch` returned: > > patching file /tmp/reviewboard.GAdWou/tmp4nYJKO Hunk #1 succeeded at > > 4297 (offset 187 lines). Hunk #2 succeeded at 4367 (offset 2 lines). > > Hunk #3 succeeded at 9821 (offset 335 lines). Hunk #4 succeeded at > > 9538 (offset 2 lines). Hunk #5 succeeded at 16413 (offset 608 lines). > > Hunk #6 succeeded at 17689 (offset 147 lines). Hunk #7 succeeded at > > 21659 (offset 760 lines). Hunk #8 succeeded at 24243 (offset 586 > > lines). Hunk #9 succeeded at 25320 (offset 809 lines). Hunk #10 > > succeeded at 25777 (offset 625 lines). patch: **** malformed patch at > > line 171: ]]][ > > > > Traceback (most recent call last): > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ > > views.py", line 153, in view_diff > > interdiffset, highlighting, True) > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ > > diffutils.py", line 623, in get_diff_files > > large_data=True) > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/Djblets-0.5.6-py2.5.egg/djblets/util/misc.py", line 162, > > in cache_memoize > > data = lookup_callable() > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ > > diffutils.py", line 622, in <lambda> > > enable_syntax_highlighting), > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ > > diffutils.py", line 345, in get_chunks > > new = get_patched_file(old, filediff) > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ > > diffutils.py", line 261, in get_patched_file > > return patch(filediff.diff, buffer, filediff.dest_file) > > File "/projects/mob_reviewboard/xampp/1.6.4-brcm-v2/lib/python2.5/ > > site-packages/ReviewBoard-1.0.5.1-py2.5.egg/reviewboard/diffviewer/ > > diffutils.py", line 129, in patch > > (filename, tempdir, patch_output)) > > Exception: The patch to 'C:/Builds/Mobcom/sysDev/21331/MMI_2/msp/stack/ > > hedge/sdt/usimap.spr' didn't apply cleanly. The temporary files have > > been left in '/tmp/reviewboard.GAdWou' for debugging purposes. > > `patch` returned: patching file /tmp/reviewboard.GAdWou/tmp4nYJKO > > Hunk #1 succeeded at 4297 (offset 187 lines). > > Hunk #2 succeeded at 4367 (offset 2 lines). > > Hunk #3 succeeded at 9821 (offset 335 lines). > > Hunk #4 succeeded at 9538 (offset 2 lines). > > Hunk #5 succeeded at 16413 (offset 608 lines). > > Hunk #6 succeeded at 17689 (offset 147 lines). > > Hunk #7 succeeded at 21659 (offset 760 lines). > > Hunk #8 succeeded at 24243 (offset 586 lines). > > Hunk #9 succeeded at 25320 (offset 809 lines). > > Hunk #10 succeeded at 25777 (offset 625 lines). > > patch: **** malformed patch at line 171: ]]][ > > -- > Want to help the Review Board project? Donate today at > http://www.reviewboard.org/donate/ > Happy user? Let us know at http://www.reviewboard.org/users/ > -~----------~----~----~----~------~----~------~--~--- > To unsubscribe from this group, send email to > reviewboard+unsubscr...@googlegroups.com<reviewboard%2bunsubscr...@googlegroups.com> > For more options, visit this group at > http://groups.google.com/group/reviewboard?hl=en > -- Want to help the Review Board project? Donate today at http://www.reviewboard.org/donate/ Happy user? Let us know at http://www.reviewboard.org/users/ -~----------~----~----~----~------~----~------~--~--- To unsubscribe from this group, send email to reviewboard+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/reviewboard?hl=en
