[Pkg-bazaar-commits] ./bzr-gtk/unstable r323: Add gsend command.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 323
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2007-10-26 18:25:04 +0200
message:
  Add gsend command.
modified:
  __init__.py
  mergedirective.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2007-10-21 16:25:29 +0000
+++ b/__init__.py	2007-10-26 16:25:04 +0000
@@ -19,14 +19,15 @@
 gannotate         GTK+ annotate. 
 gbranch           GTK+ branching. 
 gcheckout         GTK+ checkout. 
-gcommit           GTK+ commit dialog 
+gcommit           GTK+ commit dialog.
 gconflicts        GTK+ conflicts. 
 gdiff             Show differences in working tree in a GTK+ Window. 
 ginit             Initialise a new branch.
 gmissing          GTK+ missing revisions dialog. 
 gpreferences      GTK+ preferences dialog. 
-gpush             GTK+ push. 
-gstatus           GTK+ status dialog 
+gpush             GTK+ push.
+gsend             GTK+ send merge directive.
+gstatus           GTK+ status dialog.
 gtags             Manage branch tags.
 visualise         Graphically visualise this branch. 
 """
@@ -382,9 +383,19 @@
         status.run()
 
 
+class cmd_gsend(GTKCommand):
+    """GTK+ send merge directive.
+
+    """
+    def run(self):
+        (br, path) = branch.Branch.open_containing(".")
+        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
+        dialog = SendMergeDirectiveDialog(br)
+        dialog.run()
+
 
 class cmd_gconflicts(GTKCommand):
-    """ GTK+ conflicts.
+    """GTK+ conflicts.
     
     Select files from the list of conflicts and run an external utility to
     resolve them.
@@ -397,7 +408,6 @@
         dialog.run()
 
 
-
 class cmd_gpreferences(GTKCommand):
     """ GTK+ preferences dialog.
 
@@ -409,7 +419,6 @@
         dialog.run()
 
 
-
 class cmd_gmissing(Command):
     """ GTK+ missing revisions dialog.
 
@@ -466,19 +475,20 @@
 
 
 commands = [
+    cmd_gannotate, 
+    cmd_gbranch,
+    cmd_gcheckout, 
+    cmd_gcommit, 
+    cmd_gconflicts, 
+    cmd_gdiff,
+    cmd_ginit,
     cmd_gmissing, 
     cmd_gpreferences, 
-    cmd_gconflicts, 
+    cmd_gpush, 
+    cmd_gsend,
     cmd_gstatus,
-    cmd_gcommit, 
-    cmd_gannotate, 
-    cmd_visualise, 
-    cmd_gdiff,
-    cmd_gpush, 
-    cmd_gcheckout, 
-    cmd_gbranch,
-    cmd_ginit,
-    cmd_gtags
+    cmd_gtags,
+    cmd_visualise
     ]
 
 for cmd in commands:

=== modified file 'mergedirective.py'
--- a/mergedirective.py	2007-08-05 01:03:35 +0000
+++ b/mergedirective.py	2007-10-26 16:25:04 +0000
@@ -43,8 +43,14 @@
 
 
 class SendMergeDirectiveDialog(gtk.Dialog):
-    def __init__(self):
+    def __init__(self, branch):
         super(SendMergeDirectiveDialog, self).__init__()
+        self.branch = branch
+        self._create()
+
+    def _create(self):
+        # FIXME: Add field for submit branch
+        # FIXME: add field for send to address
 
 
 class ApplyMergeDirectiveDialog(gtk.Dialog):