shelf plugin, bzrlib/patches.py and binary files diff

[Alexander Belchenko]

I use Shelf plugin and very often it fails when there is changes in
binary files. I'm not sure who should draw attention for this error. Per
example little test with bzr.ico:

=====================================================================
$ bzr init
$ copy bzr.ico
$ bzr add
added bzr.ico
$ bzr st
added:
    bzr.ico
$ bzr shelve
bzr: ERROR: bzrlib.patches.MalformedPatchHeader: Malformed patch header.
   No orig name
'Binary files bzr.ico\t1970-01-01 00:00:00 +0000 and bzr.ico\t2006-08-02
04:30:46 +0000 differ\n'

Traceback (most recent call last):
    File "E:\Bazaar-NG\devel\bzr.dev\bzrlib\commands.py", line 697, in
run_bzr_catch_errors
    File "E:\Bazaar-NG\devel\bzr.dev\bzrlib\commands.py", line 659, in
run_bzr
    File "E:\Bazaar-NG\devel\bzr.dev\bzrlib\commands.py", line 281, in
run_argv_aliases
    File "E:\Bazaar-NG\plugins.work\bzrtools\__init__.py", line 179, in run
    File "E:\Bazaar-NG\plugins.work\bzrtools\shelf.py", line 195, in shelve
    File "E:\Bazaar\plugins.work\bzrtools.bialix\patchsource.py", line
14, in readpatches
      return patches.parse_patches(self.readlines())
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\patches.py", line 355,
in parse_patches
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\patches.py", line 310,
in parse_patch
    File "E:\work\MyCode\bzr\devel\bzr.dev\bzrlib\patches.py", line 61,
in get_patch_names
MalformedPatchHeader: Malformed patch header.  No orig name
'Binary files bzr.ico\t1970-01-01 00:00:00 +0000 and bzr.ico\t2006-08-02
04:30:46 +0000 differ\n'

bzr 0.10.0dev0 on python 2.4.3.final.0 (win32)
arguments: ['c:\\utils\\bzr.py', 'shelve']

** please send this report to bazaar-ng at lists.ubuntu.com
===========================================================================

Attached diff solve problem. But I'm not sure that's right solution.

--
Alexander


-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: binary-patches.diff
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20060815/08ec8547/attachment.diff