[Pkg-bazaar-commits] ./bzr-gtk/unstable r597: Merge addition of ginfo command

[Jasper Groenewegen]

------------------------------------------------------------
revno: 597
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Mon 2008-08-04 23:39:55 +0200
message:
  Merge addition of ginfo command
modified:
  NEWS
  __init__.py
  olive/info.py
    ------------------------------------------------------------
    revno: 592.4.1
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: ginfo
    timestamp: Mon 2008-08-04 22:03:36 +0200
    message:
      Add ginfo command to bzr, shows info dialog
    modified:
      __init__.py
      olive/info.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-08-04 21:37:01 +0000
+++ b/NEWS	2008-08-04 21:39:55 +0000
@@ -4,6 +4,10 @@
  
   * Add colored status messages in Olive file list (Jasper Groenewegen)
 
+ CHANGES
+ 
+  * Add ginfo command line option (Jasper Groenewegen)
+
 0.95.0	2008-08-04
 
  UI

=== modified file '__init__.py'
--- a/__init__.py	2008-08-04 18:45:47 +0000
+++ b/__init__.py	2008-08-04 20:03:36 +0000
@@ -22,6 +22,7 @@
 gconflicts        GTK+ conflicts. 
 gdiff             Show differences in working tree in a GTK+ Window. 
 ginit             Initialise a new branch.
+ginfo             GTK+ branch info dialog
 gloom             GTK+ loom browse dialog
 gmerge            GTK+ merge dialog
 gmissing          GTK+ missing revisions dialog. 
@@ -471,6 +472,19 @@
         dialog.run()
 
 
+class cmd_ginfo(Command):
+    """ GTK+ info dialog
+    
+    """
+    def run(self):
+        from bzrlib import workingtree
+        from bzrlib.plugins.gtk.olive.info import InfoDialog
+        wt = workingtree.WorkingTree.open_containing('.')[0]
+        info = InfoDialog(wt.branch)
+        info.display()
+        info.window.run()
+
+
 class cmd_gmerge(Command):
     """ GTK+ merge dialog
     
@@ -557,6 +571,7 @@
     cmd_gconflicts, 
     cmd_gdiff,
     cmd_ginit,
+    cmd_ginfo,
     cmd_gmerge,
     cmd_gmissing, 
     cmd_gpreferences, 

=== modified file 'olive/info.py'
--- a/olive/info.py	2008-07-29 15:33:58 +0000
+++ b/olive/info.py	2008-08-04 21:39:55 +0000
@@ -156,7 +156,7 @@
             return
         
         # Create the window
-        self.window = gtk.Dialog(title="Olive - Information",
+        self.window = gtk.Dialog(title="Branch Information",
                                   parent = None,
                                   flags=0,
                                   buttons=None)