[BUG] diff on modified renamed file fails horribly

[Alexander Belchenko]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I move directory and then modify one of file inside renamed directory.
When I want to view diff I have error. Note: bzr status works correct.

C:\project\> bzr st
added:
  data/inter_game/alert/
renamed:
  data/inter_game/power => data/inter_game/alert/power
modified:
  data/inter_game/alert/power/1-player-bet.test


Run diff command from project root:

C:\project\> bzr di
=== added directory 'data/inter_game/alert'
=== renamed directory 'data/inter_game/power' => 'data/inter_game/alert/power'
=== modified file 'data/inter_game/alert/power/1-player-bet.test'
bzr: ERROR: exceptions.TypeError: unsupported operand type(s) for +: 'NoneType' and 'int'

Traceback (most recent call last):
  File "E:\work\selftest.win32\bzrlib\commands.py", line 638, in run_bzr_catch_errors
    return run_bzr(argv)
  File "E:\work\selftest.win32\bzrlib\commands.py", line 600, in run_bzr
    ret = run(*run_argv)
  File "E:\work\selftest.win32\bzrlib\commands.py", line 296, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "E:\work\selftest.win32\bzrlib\commands.py", line 610, in ignore_pipe
    result = func(*args, **kwargs)
  File "E:\work\selftest.win32\bzrlib\builtins.py", line 1427, in run
    old_label=old_label, new_label=new_label)
  File "E:\work\selftest.win32\bzrlib\diff.py", line 375, in diff_cmd_helper
    extra_trees=extra_trees)
  File "E:\work\selftest.win32\bzrlib\diff.py", line 403, in show_diff_trees
    extra_trees=extra_trees)
  File "E:\work\selftest.win32\bzrlib\diff.py", line 474, in _show_diff_trees
    old_name = '%s%s\t%s' % (old_label, path,
  File "E:\work\selftest.win32\bzrlib\diff.py", line 488, in _patch_header_date
    return timestamp.format_patch_date(tree.get_file_mtime(file_id, path))
  File "E:\work\selftest.win32\bzrlib\timestamp.py", line 131, in format_patch_date
    tm = time.gmtime(secs+offset)
TypeError: unsupported operand type(s) for +: 'NoneType' and 'int'


Diff from directory where modified file resides give me empty output:

C:\project\data\inter_game\alert\power\> bzr di
<empty>

Log of last 2 diffs is attached.

C:\project\> bzr info
<...>
Format:
       control: Meta directory format 1
  working tree: Working tree format 4
        branch: Branch format 5
    repository: Knit repository format 1

In the working tree:
       504 unchanged
         1 modified
         1 added
         0 removed
         1 renamed
         1 unknown
        53 ignored
        99 versioned subdirectories
<...>


This errors occurs in 0.15final and bzr.dev too.

[µ]

P.S. Is there exists a way to send bug reports directly to launchpad via e-mail?

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGFlnbzYr338mxwCURArFFAJ9UrvdVG2cs2FH8RsMG3AuWiAxb5ACcDQy9
5tWM+w/qspX+U4ojfjy3sLE=
=OT51
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: .bzr.log
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070406/f13406f5/attachment.diff