[Pkg-bazaar-commits] ./bzr-gtk/unstable r126: Merge from trunk.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 126
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Mon 2006-12-25 09:51:59 +0100
message:
  Merge from trunk.
modified:
  __init__.py
  viz/graphcell.py
    ------------------------------------------------------------
    revno: 66.2.18
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr-gtk
    timestamp: Wed 2006-12-20 15:56:41 -0500
    message:
      Gannotate works with branches, not just trees
    modified:
      __init__.py
    ------------------------------------------------------------
    revno: 66.2.19
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr-gtk-meld
    timestamp: Thu 2006-12-21 01:19:52 -0500
    message:
      Increase box height by 1 to fix diagonal jagginess
    modified:
      viz/graphcell.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2006-12-15 18:32:34 +0000
+++ b/__init__.py	2006-12-20 20:56:41 +0000
@@ -14,6 +14,7 @@
 
 """GTK+ frontends to Bazaar commands """
 
+from bzrlib import errors
 from bzrlib.commands import Command, register_command, display_command
 from bzrlib.errors import NotVersionedError, BzrCommandError, NoSuchFile
 from bzrlib.commands import Command, register_command
@@ -167,10 +168,14 @@
         from annotate.gannotate import GAnnotateWindow
         from annotate.config import GAnnotateConfig
 
-        (wt, path) = WorkingTree.open_containing(filename)
-        branch = wt.branch
+        try:
+            (tree, path) = WorkingTree.open_containing(filename)
+            branch = tree.branch
+        except errors.NoWorkingTree:
+            (branch, path) = Branch.open_containing(filename)
+            tree = branch.basis_tree()
 
-        file_id = wt.path2id(path)
+        file_id = tree.path2id(path)
 
         if file_id is None:
             raise NotVersionedError(filename)
@@ -180,8 +185,7 @@
             revision_id = revision[0].in_history(branch).rev_id
             tree = branch.repository.revision_tree(revision_id)
         else:
-            revision_id = None
-            tree = wt
+            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
 
         window = GAnnotateWindow(all, plain)
         window.connect("destroy", lambda w: gtk.main_quit())

=== modified file 'viz/graphcell.py'
--- a/viz/graphcell.py	2006-09-06 09:27:12 +0000
+++ b/viz/graphcell.py	2006-12-21 06:19:52 +0000
@@ -107,7 +107,7 @@
         to be, we let the TreeViewColumn take care of making them all
         line up.
         """
-        box_size = self.box_size(widget)
+        box_size = self.box_size(widget) + 1
 
         cols = self.node[0]
         for start, end, colour in self.in_lines + self.out_lines: