loggerhead

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

annotate_zero_size_820065
Merge into trunk-rich

Proposed by Francesco Del Degan on 2011-08-09

Status:

Merged

Approved by:

Gavin Panella on 2011-08-11

Approved revision:

456

Merged at revision:

454

Proposed branch:

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

Merge into:

lp://staging/loggerhead

Prerequisite:

lp://staging/~pr0gg3d/loggerhead/annotate_comment_notpresent_812583

Diff against target:

46 lines (+16/-2)

2 files modified

loggerhead/controllers/annotate_ui.py (+4/-0)
loggerhead/tests/test_controllers.py (+12/-2)

To merge this branch:

bzr merge lp://staging/~pr0gg3d/loggerhead/annotate_zero_size_820065

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gavin Panella (community)		2011-08-09	Approve on 2011-08-11
Review via email: mp+70885@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-08-08.

Commit message

Don't break when annotating a zero-sized file.

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.

Revision history for this message

John A Meinel (jameinel) wrote on 2011-08-09: Posted in a previous version of this proposal

-----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-----