Rev 150: Fix handling showing diffs of working tree changes. in file:///home/jelmer/bzr-gtk/p/

Jelmer Vernooij jelmer at samba.org
Sat Feb 3 14:18:12 GMT 2007


At file:///home/jelmer/bzr-gtk/p/

------------------------------------------------------------
revno: 150
revision-id: jelmer at samba.org-20070203141740-g245bw1duopwmxw7
parent: jelmer at samba.org-20070203130112-m1stbo29f1ahthzs
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: p
timestamp: Sat 2007-02-03 15:17:40 +0100
message:
  Fix handling showing diffs of working tree changes.
modified:
  annotate/gannotate.py          xannotate.py-20051024072750-fe35acd6bb909bd3
=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py	2007-02-03 13:01:12 +0000
+++ b/annotate/gannotate.py	2007-02-03 14:17:40 +0000
@@ -243,7 +243,7 @@
                 tree2 = repository.revision_tree(revision.parent_ids[0])
             else:
                 tree2 = repository.revision_tree(NULL_REVISION)
-        from bzrlib.plugins.gtk.viz.diff import DiffWindow
+        from bzrlib.plugins.gtk.diff import DiffWindow
         window = DiffWindow()
         window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
         window.set_file(tree1.id2path(self.file_id))
@@ -376,6 +376,7 @@
         self.message = "?"
         self.timestamp = 0.0
         self.timezone = 0
+        self.properties = []
 
 
 class RevisionCache(object):




More information about the bazaar-commits mailing list