Rev 483: Fix diff test. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 483
revision-id: jelmer at samba.org-20080504131117-un04sg0bi0thm3h6
parent: jelmer at samba.org-20080501220713-e23350wearov8smj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-04 15:11:17 +0200
message:
  Fix diff test.
modified:
  branchview/treemodel.py        treemodel.py-20070909175138-leue3q5w1rxy86hw-1
  tests/test_commit.py           test_commit.py-20070928204312-v6ffg8vz27644log-2
  ui.py                          ui.py-20060716163355-owuqwa9uhnlfsojs-1
=== modified file 'branchview/treemodel.py'
--- a/branchview/treemodel.py	2008-04-24 15:26:14 +0000
+++ b/branchview/treemodel.py	2008-05-04 13:11:17 +0000
@@ -93,7 +93,7 @@
         if column == PARENTS: return parents
         if column == CHILDREN: return children
         if column == LAST_LINES:
-            if rowref>0:
+            if rowref > 0:
                 return self.line_graph_data[rowref-1][2]
             return []
         if column == REVNO: return ".".join(["%d" % (revno)

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2007-11-02 22:08:54 +0000
+++ b/tests/test_commit.py	2008-05-04 13:11:17 +0000
@@ -411,22 +411,22 @@
         text = diff_buffer.get_text(diff_buffer.get_start_iter(),
                                     diff_buffer.get_end_iter()).splitlines(True)
 
-        self.assertEqual("=== removed file 'b'\n", text[0])
+        self.assertEqual("=== modified file 'a'\n", text[0])
         self.assertContainsRe(text[1],
-            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
-        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
-        self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
-        self.assertEqual('-contents of tree/b\n', text[4])
-        self.assertEqual('\n', text[5])
-
-        self.assertEqual("=== modified file 'a'\n", text[6])
-        self.assertContainsRe(text[7],
             r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
+        self.assertContainsRe(text[2],
+            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
+        self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
+        self.assertEqual('-contents of tree/a\n', text[4])
+        self.assertEqual('+new contents for a\n', text[5])
+        self.assertEqual('\n', text[6])
+
+        self.assertEqual("=== removed file 'b'\n", text[7])
         self.assertContainsRe(text[8],
-            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
-        self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
-        self.assertEqual('-contents of tree/a\n', text[10])
-        self.assertEqual('+new contents for a\n', text[11])
+            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
+        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
+        self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
+        self.assertEqual('-contents of tree/b\n', text[11])
         self.assertEqual('\n', text[12])
 
         self.assertEqual('Diff for All Files', dlg._diff_label.get_text())

=== modified file 'ui.py'
--- a/ui.py	2008-03-20 16:06:23 +0000
+++ b/ui.py	2008-05-04 13:11:17 +0000
@@ -86,6 +86,8 @@
 
     def remove(self, pb):
         self.vbox.remove(pb)
+        if len(self.vbox.get_children()) == 0: # If there is nothing to show, don't leave a ghost window here
+             self.destroy()
 
 
 class PasswordDialog(gtk.Dialog):