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

[Martin Pool]

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

[John A Meinel (jameinel)]

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

[Curtis Hovey (sinzui)]

Hi Martin.

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

=== modified file 'annotate/gannotate.py'
--- annotate/gannotate.py	2010-05-27 02:28:54 +0000
+++ annotate/gannotate.py	2011-01-27 03:01:30 +0000
@@ -49,9 +49,9 @@
         self.all = all
         self.plain = plain
         self._branch = branch
-        
+
         Window.__init__(self, parent)
-        
+
         self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
         self.annotate_colormap = AnnotateColorSaturation()
 
@@ -68,15 +68,15 @@
         self.revisionview.set_file_id(file_id)
         self.revision_id = getattr(tree, 'get_revision_id', 
                                    lambda: CURRENT_REVISION)()
-        
+
         # [revision id, line number, author, revno, highlight color, line]
         self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
-                                       gobject.TYPE_STRING,
+                                       gobject.TYPE_INT,
                                        gobject.TYPE_STRING,
                                        gobject.TYPE_STRING,
                                        gobject.TYPE_STRING,
                                        gobject.TYPE_STRING)
-        
+
         last_seen = None
         try:
             branch.lock_read()
@@ -86,7 +86,7 @@
             for revision_id, revno in revno_map.iteritems():
                 self.dotted[revision_id] = '.'.join(str(num) for num in revno)
             for line_no, (revision, revno, line)\
-                    in enumerate(self._annotate(tree, file_id)):
+                in enumerate(self._annotate(tree, file_id)):
                 if revision.revision_id == last_seen and not self.all:
                     revno = author = ""
                 else:
@@ -102,7 +102,7 @@
                                        revno,
                                        None,
                                        line.rstrip("\r\n")
-                                      ])
+                                       ])
                 self.annotations.append(revision)
 
             if not self.plain:
@@ -125,7 +125,7 @@
             # bar?
             print("gannotate: Line number %d does't exist. Defaulting to "
                   "line 1." % lineno)
-	    return
+            return
         else:
             row = lineno - 1
 
@@ -218,7 +218,7 @@
         hbox.pack_start(self.goto_button, expand=False, fill=True)
         hbox.show()
         vbox.pack_start(hbox, expand=False, fill=True)
-        
+
         self.pane = pane = gtk.VPaned()
         pane.add1(swbox)
         pane.add2(self.revisionview)
@@ -532,18 +532,22 @@
 
     def _match(self, model, iterator, column):
         matching_case = self._match_case.get_active()
-        string, = model.get(iterator, column)
+        cell_value, = model.get(iterator, column)
         key = self._entry.get_text()
-        if self._regexp.get_active():
+        if column == LINE_NUM_COL:
+            # FIXME: For goto-line there are faster algorithms than searching 
+            # every line til we find the right one! -- mbp 2011-01-27
+            return key.strip() == str(cell_value)
+        elif self._regexp.get_active():
             if matching_case:
-                match = re.compile(key).search(string, 1)
+                match = re.compile(key).search(cell_value, 1)
             else:
-                match = re.compile(key, re.I).search(string, 1)
+                match = re.compile(key, re.I).search(cell_value, 1)
         else:
             if not matching_case:
-                string = string.lower()
+                cell_value = cell_value.lower()
                 key = key.lower()
-            match = string.find(key) != -1
+            match = cell_value.find(key) != -1
 
         return match
 
@@ -583,4 +587,4 @@
                 path = model.get_path(row)
                 self._view.set_cursor(path)
                 self._view.scroll_to_cell(path, use_align=True)
-                break
+                break
\ No newline at end of file