Merge lp://staging/~mbp/bzr-gtk/707482-typeerror into lp://staging/bzr-gtk/gtk2

Proposed by Martin Pool
Status: Merged
Merged at revision: 706
Proposed branch: lp://staging/~mbp/bzr-gtk/707482-typeerror
Merge into: lp://staging/bzr-gtk/gtk2
Diff against target: 106 lines (+20/-16)
1 file modified
annotate/gannotate.py (+20/-16)
To merge this branch: bzr merge lp://staging/~mbp/bzr-gtk/707482-typeerror
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+47628@code.staging.launchpad.net

Description of the change

Per <https://bugs.launchpad.net/bzr-gtk/+bug/707482>, we shouldn't assume that you can just poke ints into a string-typed list model column.

(My editor also changed some tabs to spaces, consistent with the rest of the file.)

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 1/26/2011 9:01 PM, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr-gtk/707482-typeerror into lp:bzr-gtk.
>
> Requested reviews:
> Bazaar GTK maintainers (bzr-gtk)
> Related bugs:
> #707482 gannotate wrong column type
> https://bugs.launchpad.net/bugs/707482
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr-gtk/707482-typeerror/+merge/47628
>
> Per <https://bugs.launchpad.net/bzr-gtk/+bug/707482>, we shouldn't assume that you can just poke ints into a string-typed list model column.
>
> (My editor also changed some tabs to spaces, consistent with the rest of the file.)

I followed the conversation, and your logic is sensible here. I'm not
super familiar with pygtk, but your changes seem good to me.

I certainly agree that doing string compares to jump to a line number is
a bit odd, but hey, no worse than it was.

So approve from me, at least.
 review: approve

John
=:->

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

iEYEARECAAYFAk1BG64ACgkQJdeBCYSNAAN0YwCgqzZxMApidpF6vhSShllo6Tv2
hVcAn1SFDnmc1YT6vFTrn2ya4WnrXuOJ
=59pA
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Curtis Hovey (sinzui) wrote :

Hi Martin.

Thank you for the branch. This does fix the gtk column type issue in gannotate.

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

to all changes:
to status/vote changes: