[Buildbot-commits] buildbot/buildbot/clients debug.glade,1.1,1.2 debug.py,1.1,1.2
Brian Warner
warner at users.sourceforge.net
Tue Oct 25 01:57:35 UTC 2005
Update of /cvsroot/buildbot/buildbot/buildbot/clients
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14021/buildbot/clients
Modified Files:
debug.glade debug.py
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-384
Creator: Brian Warner <warner at lothar.com>
add 'branch' box to the debugclient's fake-commit command
* buildbot/clients/debug.glade: add 'branch' box to fake-commit
* buildbot/clients/debug.py (DebugWidget.do_commit): same. Don't
send the branch= argument unless the user really provided one, to
retain compatibility with older buildmasters that don't accept
that argument.
* buildbot/master.py (DebugPerspective.perspective_fakeChange):
same
Index: debug.glade
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/debug.glade,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.glade 22 Apr 2005 02:57:23 -0000 1.1
+++ debug.glade 25 Oct 2005 01:57:33 -0000 1.2
@@ -17,6 +17,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -60,6 +61,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -198,7 +203,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes">twisted/internet/app.py</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -234,6 +239,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -251,7 +260,59 @@
<property name="max_length">0</property>
<property name="text" translatable="yes">bob</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="usebranch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Branch:</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_usebranch_toggled" last_modification_time="Tue, 25 Oct 2005 01:42:45 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="branch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -303,7 +364,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -337,6 +398,10 @@
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
@@ -383,6 +448,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -400,7 +469,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes">one</property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -475,6 +544,10 @@
<property name="yalign">0.5</property>
<property name="xpad">7</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -573,6 +646,10 @@
<property name="yalign">0.5</property>
<property name="xpad">2</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">label_item</property>
Index: debug.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/clients/debug.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.py 22 Apr 2005 02:57:23 -0000 1.1
+++ debug.py 25 Oct 2005 01:57:33 -0000 1.2
@@ -36,6 +36,8 @@
c('do_poke_irc', self.do_poke_irc)
c('do_build', self.do_build)
c('do_commit', self.do_commit)
+ c('on_usebranch_toggled', self.usebranch_toggled)
+ self.usebranch_toggled(g('usebranch'))
c('on_userevision_toggled', self.userevision_toggled)
self.userevision_toggled(g('userevision'))
c('do_current_offline', self.do_current, "offline")
@@ -92,6 +94,13 @@
d = self.remote.callRemote("forceBuild", name)
d.addErrback(self.err)
+ def usebranch_toggled(self, widget):
+ rev = self.xml.get_widget('branch')
+ if widget.get_active():
+ rev.set_sensitive(True)
+ else:
+ rev.set_sensitive(False)
+
def userevision_toggled(self, widget):
rev = self.xml.get_widget('revision')
if widget.get_active():
@@ -104,6 +113,13 @@
return
filename = self.filename.get_text()
who = self.xml.get_widget("who").get_text()
+
+ branch = None
+ if self.xml.get_widget("usebranch").get_active():
+ branch = self.xml.get_widget('branch').get_text()
+ if branch == '':
+ branch = None
+
revision = None
if self.xml.get_widget("userevision").get_active():
revision = self.xml.get_widget('revision').get_text()
@@ -111,8 +127,13 @@
revision = int(revision)
except ValueError:
pass
- d = self.remote.callRemote("fakeChange", filename,
- revision=revision, who=who)
+ if revision == '':
+ revision = None
+
+ kwargs = { 'revision': revision, 'who': who }
+ if branch:
+ kwargs['branch'] = branch
+ d = self.remote.callRemote("fakeChange", filename, **kwargs)
d.addErrback(self.err)
def do_current(self, widget, state):
More information about the Commits
mailing list