--- /dev/null
+static MergeBranch _MergeBranch;
+
+public class MergeBranch : Object
+{
+ public Gtk.Dialog el;
+ private MergeBranch _this;
+
+ public static MergeBranch singleton()
+ {
+ if (_MergeBranch == null) {
+ _MergeBranch= new MergeBranch();
+ }
+ return _MergeBranch;
+ }
+ public Xcls_actionsel actionsel;
+ public Xcls_actioncellrenderer actioncellrenderer;
+ public Xcls_actionmodel actionmodel;
+ public Xcls_ticketsel ticketsel;
+ public Xcls_dbcellrenderer dbcellrenderer;
+ public Xcls_dbmodel dbmodel;
+ public Xcls_name name;
+
+ // my vars (def)
+ public RooTicket? ticket;
+ public bool running;
+
+ // ctor
+ public MergeBranch()
+ {
+ _this = this;
+ this.el = new Gtk.Dialog();
+
+ // my vars (dec)
+ this.ticket = null;
+ this.running = false;
+
+ // set gobject values
+ this.el.title = "Merge Branch";
+ this.el.default_height = 200;
+ this.el.default_width = 500;
+ this.el.deletable = true;
+ this.el.modal = true;
+ var child_0 = new Xcls_VBox2( _this );
+ child_0.ref();
+ this.el.get_content_area().add ( child_0.el );
+ var child_1 = new Xcls_Button14( _this );
+ child_1.ref();
+ this.el.add_action_widget ( child_1.el , 0 );
+ var child_2 = new Xcls_Button15( _this );
+ child_2.ref();
+ this.el.add_action_widget ( child_2.el , 1 );
+
+ //listeners
+ this.el.delete_event.connect( (self, event) => {
+ this.el.hide();
+ return true;
+ //test
+ });
+ this.el.response.connect( (self, response_id) => {
+
+ GLib.debug("got %d", (int) response_id);
+ if (response_id == 0) {
+ _this.el.hide();
+ this.running = false;
+ GitMonitor.gitmonitor.start();
+ return;
+ }
+ /*
+ // have they selected a ticket..
+ // make that the current active ticket?
+ // we really need to store locally what ticket is being worked on..
+ // in theory we could be working on multiple project and not merging..
+ // -- each repo would have their active ticket (only one per repo)
+ // -- so we could just store that in there
+ // -- initial load can check the contents of the ticket files on first scan.
+ var ticket_id = _this.ticketsel.selectedTicketId();
+
+ if (this.repo != null) {
+ var bn = _this.name.el.get_text();
+ if (ticket_id != "" ) {
+ this.repo.setActiveTicket( RooTicket.singleton().getById(ticket_id), bn);
+ } else {
+ this.repo.createBranchNamed(bn);
+ }
+ }
+ */
+
+ GitRepo.doMerges(
+ _this.actionsel.selectedAction(),
+ _this.ticketsel.selectedTicketId(),
+ _this.name.el.get_text()
+ );
+
+ this.running = false;
+
+
+ _this.el.hide();
+ GitMonitor.gitmonitor.start();
+
+
+ });
+ this.el.show.connect( (self) => {
+
+
+ //test
+ });
+ }
+
+ // user defined functions
+ public void show ( RooTicket ticket )
+ {
+ // this.el.set_gravity(Gdk.Gravity.NORTH);
+ if (this.running) {
+ return;
+ }
+ GitMonitor.gitmonitor.stop();
+
+ this.ticket = ticket;
+
+ this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
+ GLib.debug("Loading tickets");
+
+
+ this.el.show_all();
+ _this.dbmodel.loadTickets();
+ _this.actionmodel.loadActions();
+
+
+ }
+ public class Xcls_VBox2 : Object
+ {
+ public Gtk.VBox el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_VBox2(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.VBox( true, 0 );
+
+ // my vars (dec)
+
+ // set gobject values
+ var child_0 = new Xcls_Table3( _this );
+ child_0.ref();
+ this.el.pack_start ( child_0.el , false,false,0 );
+ }
+
+ // user defined functions
+ }
+ public class Xcls_Table3 : Object
+ {
+ public Gtk.Table el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Table3(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Table( 2, 2, false );
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.margin = 2;
+ this.el.column_spacing = 2;
+ var child_0 = new Xcls_Label4( _this );
+ child_0.ref();
+ this.el.attach_defaults ( child_0.el , 0,1,0,1 );
+ var child_1 = new Xcls_actionsel( _this );
+ child_1.ref();
+ this.el.attach_defaults ( child_1.el , 1,2,0,1 );
+ var child_2 = new Xcls_Label8( _this );
+ child_2.ref();
+ this.el.attach_defaults ( child_2.el , 0,1,1,2 );
+ var child_3 = new Xcls_ticketsel( _this );
+ child_3.ref();
+ this.el.attach_defaults ( child_3.el , 1,2,1,2 );
+ var child_4 = new Xcls_Label12( _this );
+ child_4.ref();
+ this.el.attach_defaults ( child_4.el , 0,1,2,3 );
+ var child_5 = new Xcls_name( _this );
+ child_5.ref();
+ this.el.attach_defaults ( child_5.el , 1,2,2,3 );
+ }
+
+ // user defined functions
+ }
+ public class Xcls_Label4 : Object
+ {
+ public Gtk.Label el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Label4(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Label( "Do what?" );
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.justify = Gtk.Justification.RIGHT;
+ this.el.xalign = 0.900000f;
+ this.el.visible = true;
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_actionsel : Object
+ {
+ public Gtk.ComboBox el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+ public bool loading;
+
+ // ctor
+ public Xcls_actionsel(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.actionsel = this;
+ this.el = new Gtk.ComboBox();
+
+ // my vars (dec)
+ this.loading = false;
+
+ // set gobject values
+ var child_0 = new Xcls_actioncellrenderer( _this );
+ child_0.ref();
+ this.el.pack_start ( child_0.el , true );
+ var child_1 = new Xcls_actionmodel( _this );
+ child_1.ref();
+ this.el.set_model ( child_1.el );
+
+ // init method
+
+ this.el.add_attribute(_this.actioncellrenderer.el , "markup", 1 );
+
+ //listeners
+ this.el.changed.connect( () => {
+ if (this.loading) {
+ return;
+ }
+ _this.name.updateText();
+ //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
+ });
+ }
+
+ // user defined functions
+ public string selectedAction () {
+ Gtk.TreeIter iter;
+ Value val1;
+
+ this.el.get_active_iter (out iter);
+ _this.actionmodel.el.get_value (iter, 0, out val1);
+
+ return (string) val1;
+ }
+ }
+ public class Xcls_actioncellrenderer : Object
+ {
+ public Gtk.CellRendererText el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_actioncellrenderer(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.actioncellrenderer = this;
+ this.el = new Gtk.CellRendererText();
+
+ // my vars (dec)
+
+ // set gobject values
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_actionmodel : Object
+ {
+ public Gtk.ListStore el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_actionmodel(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.actionmodel = this;
+ this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
+
+ // my vars (dec)
+
+ // set gobject values
+ }
+
+ // user defined functions
+ public void loadActions () {
+
+
+
+ _this.actionsel.loading = true;
+
+ this.el.clear();
+ Gtk.TreeIter iter;
+ var el = this.el;
+
+ el.append(out iter);
+
+
+ el.set_value(iter, 0, "");
+ el.set_value(iter, 1, "-- select action --");
+
+ _this.actionsel.el.set_active_iter(iter);
+
+ el.append(out iter);
+ el.set_value(iter, 0, "CLOSE");
+ el.set_value(iter, 1, "Merge changes to master - and CLOSE ticket");
+
+
+ el.append(out iter);
+ el.set_value(iter, 0, "LEAVE");
+ el.set_value(iter, 1, "Merge changes to master - and LEAVE ticket open");
+
+ el.append(out iter);
+ el.set_value(iter, 0, "MASTER");
+ el.set_value(iter, 1, "Merge changes FROM master into this branch");
+
+ el.append(out iter);
+ el.set_value(iter, 0, "EXIT");
+ el.set_value(iter, 1, "Switch back to MASTER branch - no merge");
+
+
+
+ _this.actionsel.loading = false;
+ //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);
+
+ }
+ }
+
+
+ public class Xcls_Label8 : Object
+ {
+ public Gtk.Label el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Label8(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Label( "Select Ticket" );
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.justify = Gtk.Justification.RIGHT;
+ this.el.xalign = 0.900000f;
+ this.el.visible = true;
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_ticketsel : Object
+ {
+ public Gtk.ComboBox el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+ public bool loading;
+
+ // ctor
+ public Xcls_ticketsel(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.ticketsel = this;
+ this.el = new Gtk.ComboBox();
+
+ // my vars (dec)
+ this.loading = false;
+
+ // set gobject values
+ var child_0 = new Xcls_dbcellrenderer( _this );
+ child_0.ref();
+ this.el.pack_start ( child_0.el , true );
+ var child_1 = new Xcls_dbmodel( _this );
+ child_1.ref();
+ this.el.set_model ( child_1.el );
+
+ // init method
+
+ this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+
+ //listeners
+ this.el.changed.connect( () => {
+ if (this.loading) {
+ return;
+ }
+
+
+ _this.name.updateText();
+ //_this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+
+ //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
+ });
+ }
+
+ // user defined functions
+ public string selectedTicketId () {
+ Gtk.TreeIter iter;
+ Value val1;
+
+
+ this.el.get_active_iter (out iter);
+ _this.dbmodel.el.get_value (iter, 0, out val1);
+
+
+ return (string) val1;
+
+
+
+
+ }
+ }
+ public class Xcls_dbcellrenderer : Object
+ {
+ public Gtk.CellRendererText el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_dbcellrenderer(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.dbcellrenderer = this;
+ this.el = new Gtk.CellRendererText();
+
+ // my vars (dec)
+
+ // set gobject values
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_dbmodel : Object
+ {
+ public Gtk.ListStore el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_dbmodel(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.dbmodel = this;
+ this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
+
+ // my vars (dec)
+
+ // set gobject values
+ }
+
+ // user defined functions
+ public void loadTickets () {
+
+ RooTicket.singleton().loadTickets();
+
+ _this.ticketsel.loading = true;
+
+ this.el.clear();
+ Gtk.TreeIter iter;
+ var el = this.el;
+
+ el.append(out iter);
+
+
+ el.set_value(iter, 0, "");
+ el.set_value(iter, 1, "-- select a ticket --");
+
+ _this.ticketsel.el.set_active_iter(iter);
+ var tickets = RooTicket.singleton().tickets;
+ foreach(var ticket in tickets) {
+
+ el.append(out iter);
+
+ el.set_value(iter, 0, ticket.id);
+ el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
+ if (_this.ticket.id == ticket.id) {
+ _this.ticketsel.el.set_active_iter(iter);
+ }
+
+ }
+
+ _this.ticketsel.loading = false;
+ //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);
+
+ }
+ }
+
+
+ public class Xcls_Label12 : Object
+ {
+ public Gtk.Label el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Label12(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Label( "Use this commit message" );
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.justify = Gtk.Justification.RIGHT;
+ this.el.xalign = 0.900000f;
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_name : Object
+ {
+ public Gtk.Entry el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_name(MergeBranch _owner )
+ {
+ _this = _owner;
+ _this.name = this;
+ this.el = new Gtk.Entry();
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.visible = true;
+ }
+
+ // user defined functions
+ public void updateText () {
+ var ticket_id = _this.ticketsel.selectedTicketId();
+
+ RooTicket ticket = null;
+ if (ticket_id.length > 0){
+ ticket = RooTicket.singleton().getById(ticket_id);
+ }
+
+ var name = RooTicket.singleton().usernameLocal();
+ var action = _this.actionsel.selectedAction();
+ this.el.set_editable(true);
+ switch (action) {
+ case "CLOSE": // merge changes and close..
+ this.el.set_text("Fix #%s - %s".printf(ticket_id, ticket != null ? ticket.summary : ""));
+ break;
+ case "LEAVE": // partial fix
+ this.el.set_text("Partial Fix #%s - %s".printf(ticket_id, ticket != null ? ticket.summary : ""));
+ break;
+ case "MASTER": // merge master
+ case "EXIT": // just switch back...
+ this.el.set_editable(false);
+ this.el.set_text(""); // not relivant..
+ break;
+ default:
+
+ break; /// don't fix the text value.
+ }
+
+ }
+ }
+
+
+
+ public class Xcls_Button14 : Object
+ {
+ public Gtk.Button el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Button14(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Button();
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.relief = Gtk.ReliefStyle.NONE;
+ this.el.label = "Cancel";
+ }
+
+ // user defined functions
+ }
+
+ public class Xcls_Button15 : Object
+ {
+ public Gtk.Button el;
+ private MergeBranch _this;
+
+
+ // my vars (def)
+
+ // ctor
+ public Xcls_Button15(MergeBranch _owner )
+ {
+ _this = _owner;
+ this.el = new Gtk.Button();
+
+ // my vars (dec)
+
+ // set gobject values
+ this.el.label = "Do Merge";
+ }
+
+ // user defined functions
+ }
+
+}
projects / gitlive / blobdiff