| 2007-04-06 20:28:10 |
Alexander Belchenko |
bug |
|
|
added bug |
| 2007-04-11 09:47:04 |
Alexander Belchenko |
bzr: status |
Unconfirmed |
Confirmed |
|
| 2007-04-11 09:47:04 |
Alexander Belchenko |
bzr: importance |
Undecided |
Medium |
|
| 2007-04-11 09:47:04 |
Alexander Belchenko |
bzr: statusexplanation |
|
Another user report about this bug in ML.
aLTer wrote:
$ bzr di>d.diff
bzr: ERROR: exceptions.TypeError: unsupported operand type(s) for +:
'NoneType' and 'int'
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
650, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
612, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
304, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
622, in ignore_pipe
result = func(*args, **kwargs)
File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 1438, in run
old_label=old_label, new_label=new_label)
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 375, in
diff_cmd_helper
extra_trees=extra_trees)
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 403, in
show_diff_trees
extra_trees=extra_trees)
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 474, in
_show_diff_trees
old_name = '%s%s\t%s' % (old_label, path,
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 488, in
_patch_header_date
return timestamp.format_patch_date(tree.get_file_mtime(file_id, path))
File "/usr/lib/python2.4/site-packages/bzrlib/timestamp.py", line
131, in format_patch_date
tm = time.gmtime(secs+offset)
TypeError: unsupported operand type(s) for +: 'NoneType' and 'int'
bzr 0.15.0 on python 2.4.4.candidate.0 (linux2)
arguments: ['/usr/bin/bzr', 'di']
|
|
| 2007-04-11 15:12:51 |
Alexander Belchenko |
bzr: importance |
Medium |
High |
|
| 2007-04-11 15:12:51 |
Alexander Belchenko |
bzr: statusexplanation |
Another user report about this bug in ML.
aLTer wrote:
$ bzr di>d.diff
bzr: ERROR: exceptions.TypeError: unsupported operand type(s) for +:
'NoneType' and 'int'
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
650, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
612, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
304, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line
622, in ignore_pipe
result = func(*args, **kwargs)
File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 1438, in run
old_label=old_label, new_label=new_label)
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 375, in
diff_cmd_helper
extra_trees=extra_trees)
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 403, in
show_diff_trees
extra_trees=extra_trees)
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 474, in
_show_diff_trees
old_name = '%s%s\t%s' % (old_label, path,
File "/usr/lib/python2.4/site-packages/bzrlib/diff.py", line 488, in
_patch_header_date
return timestamp.format_patch_date(tree.get_file_mtime(file_id, path))
File "/usr/lib/python2.4/site-packages/bzrlib/timestamp.py", line
131, in format_patch_date
tm = time.gmtime(secs+offset)
TypeError: unsupported operand type(s) for +: 'NoneType' and 'int'
bzr 0.15.0 on python 2.4.4.candidate.0 (linux2)
arguments: ['/usr/bin/bzr', 'di']
|
Also this effect occurs after merge branch with such changes. |
|
| 2007-04-11 17:50:58 |
John A Meinel |
bzr: status |
Confirmed |
Fix Committed |
|
| 2007-04-11 17:50:58 |
John A Meinel |
bzr: assignee |
|
jameinel |
|
| 2007-04-11 17:50:58 |
John A Meinel |
bzr: statusexplanation |
Also this effect occurs after merge branch with such changes. |
I have a fix for this in the associated branch. |
|
| 2007-04-11 17:51:41 |
John A Meinel |
bzr: status |
Fix Committed |
Confirmed |
|
| 2007-04-11 17:51:41 |
John A Meinel |
bzr: assignee |
jameinel |
|
|
| 2007-04-11 17:51:41 |
John A Meinel |
bzr: statusexplanation |
I have a fix for this in the associated branch. |
sorry, wrong bug. |
|
| 2007-04-11 22:06:48 |
John A Meinel |
bzr: status |
Confirmed |
Fix Committed |
|
| 2007-04-11 22:06:48 |
John A Meinel |
bzr: assignee |
|
jameinel |
|
| 2007-04-11 22:06:48 |
John A Meinel |
bzr: statusexplanation |
sorry, wrong bug. |
This bug has now been fixed in the associated branch (I should have just waited :)
I changed the code so it properly looks up the old path when a file is modified, so if you rename a directory the diff shows:
--- olddir/file
+++ newdir/file
And I added a bunch more direct tests of 'show_diff_trees' which seemed like it wasn't quite tested enough anyway. |
|
| 2007-04-20 19:21:31 |
Alexander Belchenko |
bzr: status |
Fix Committed |
Fix Released |
|
| 2007-04-20 19:21:31 |
Alexander Belchenko |
bzr: statusexplanation |
This bug has now been fixed in the associated branch (I should have just waited :)
I changed the code so it properly looks up the old path when a file is modified, so if you rename a directory the diff shows:
--- olddir/file
+++ newdir/file
And I added a bunch more direct tests of 'show_diff_trees' which seemed like it wasn't quite tested enough anyway. |
Already in bzr.dev |
|
