Merge lp://staging/~pr0gg3d/loggerhead/annotate_zero_size_820065 into lp://staging/loggerhead

Proposed by Francesco Del Degan
Status: Superseded
Proposed branch: lp://staging/~pr0gg3d/loggerhead/annotate_zero_size_820065
Merge into: lp://staging/loggerhead
Diff against target: 35 lines (+15/-0)
2 files modified
loggerhead/controllers/annotate_ui.py (+4/-0)
loggerhead/tests/test_controllers.py (+11/-0)
To merge this branch: bzr merge lp://staging/~pr0gg3d/loggerhead/annotate_zero_size_820065
Reviewer Review Type Date Requested Status
Loggerhead Reviewers Pending
Review via email: mp+70789@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2011-08-09.

Description of the change

This fixes #820065

The bug occurs when trying to annotate a zero-sized file.
The last_lineno is None, and an exception is raised at the end of method.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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

On 8/8/2011 11:09 PM, Francesco Del Degan wrote:
> Francesco Del Degan has proposed merging
> lp:~pr0gg3d/loggerhead/annotate_zero_size_820065 into lp:loggerhead.
>
> Requested reviews: Loggerhead Reviewers (loggerhead-reviewers)
> Related bugs: Bug #820065 in loggerhead: "TypeError: unsupported
> operand type(s) for -: 'int' and 'NoneType'"
> https://bugs.launchpad.net/loggerhead/+bug/820065
>
> For more details, see:
> https://code.launchpad.net/~pr0gg3d/loggerhead/annotate_zero_size_820065/+merge/70789
>
> This fixes #820065
>
> The bug occurs when trying to annotate a zero-sized file. The
> last_lineno is None, and an exception is raised at the end of
> method.
>
>

Good change, but again, it would be nice to have a simple test for this.

John
=:->

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

iEYEARECAAYFAk5BBXsACgkQJdeBCYSNAAPa1gCgsUeNvuKXWegQldo8I3bNUGGD
iz8AoMPb5kLkd+99xuxXSZRboFZ0rWJA
=wL8n
-----END PGP SIGNATURE-----

454. By Francesco Del Degan

Added test against zero-sized files

455. By Francesco Del Degan

Merged from lp:~pr0gg3d/loggerhead/annotate_comment_notpresent_812583

456. By Francesco Del Degan

Test fixture

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches