}
return _MergeBranch;
}
- public Xcls_ticketsel ticketsel;
- public Xcls_dbcellrenderer dbcellrenderer;
- public Xcls_dbmodel dbmodel;
+ 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 GitRepo? repo;
+ public GitRepo repo;
+ public RooTicket? ticket;
public bool running;
// ctor
this.el = new Gtk.Dialog();
// my vars (dec)
- this.repo = null;
+ this.ticket = null;
this.running = false;
// set gobject values
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..
this.repo.createBranchNamed(bn);
}
}
-
+ */
+
+ if (this.repo != null) {
+ repo.doMerge(
+ _this.actionsel.selectedAction(),
+ _this.ticketsel.selectedTicketId(),
+ _this.name.el.get_text()
+ );
+
+ } else {
+ GitRepo.doMerges(
+ _this.actionsel.selectedAction(),
+ _this.ticketsel.selectedTicketId(),
+ _this.name.el.get_text()
+ );
+ }
this.running = false;
_this.el.hide();
-
+ GitMonitor.gitmonitor.start();
});
}
// user defined functions
- public void show ( GitRepo repo )
+ public void show ( RooTicket ticket, GitRepo? repo )
{
// this.el.set_gravity(Gdk.Gravity.NORTH);
if (this.running) {
return;
}
+ GitMonitor.gitmonitor.stop();
+
+ this.ticket = ticket;
this.repo = repo;
this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
this.el.show_all();
_this.dbmodel.loadTickets();
+ _this.actionmodel.loadActions();
+
}
public class Xcls_VBox2 : Object
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_ticketsel( _this );
+ 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,0,1 );
+ 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,0,1 );
+ 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,1,2 );
+ 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,1,2 );
+ this.el.attach_defaults ( child_5.el , 1,2,2,3 );
}
// user defined functions
public Xcls_Label4(MergeBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Label( "Select Ticket" );
+ this.el = new Gtk.Label( "Do what?" );
// my vars (dec)
// user defined functions
}
- public class Xcls_ticketsel : Object
+ public class Xcls_actionsel : Object
{
public Gtk.ComboBox el;
private MergeBranch _this;
public bool loading;
// ctor
- public Xcls_ticketsel(MergeBranch _owner )
+ public Xcls_actionsel(MergeBranch _owner )
{
_this = _owner;
- _this.ticketsel = this;
+ _this.actionsel = this;
this.el = new Gtk.ComboBox();
// my vars (dec)
this.loading = false;
// set gobject values
- var child_0 = new Xcls_dbcellrenderer( _this );
+ var child_0 = new Xcls_actioncellrenderer( _this );
child_0.ref();
this.el.pack_start ( child_0.el , true );
- var child_1 = new Xcls_dbmodel( _this );
+ var child_1 = new Xcls_actionmodel( _this );
child_1.ref();
this.el.set_model ( child_1.el );
// init method
- this.el.add_attribute(_this.dbcellrenderer.el , "markup", 1 );
+ this.el.add_attribute(_this.actioncellrenderer.el , "markup", 1 );
//listeners
this.el.changed.connect( () => {
if (this.loading) {
return;
}
- var ticket_id = this.selectedTicketId();
-
- var name = RooTicket.singleton().usernameLocal();
-
- if (ticket_id == "" || ticket_id == null) {
-
- var dt = new DateTime.now_local();
- _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
- return;
- }
-
-
- var ticket = RooTicket.singleton().getById(ticket_id);
-
- _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
-
+ _this.name.updateText();
//GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
});
}
// user defined functions
- public string selectedTicketId () {
- Gtk.TreeIter iter;
+ public string selectedAction () {
+ Gtk.TreeIter iter;
Value val1;
-
this.el.get_active_iter (out iter);
- _this.dbmodel.el.get_value (iter, 0, out val1);
-
+ _this.actionmodel.el.get_value (iter, 0, out val1);
return (string) val1;
-
-
-
-
}
}
- public class Xcls_dbcellrenderer : Object
+ public class Xcls_actioncellrenderer : Object
{
public Gtk.CellRendererText el;
private MergeBranch _this;
// my vars (def)
// ctor
- public Xcls_dbcellrenderer(MergeBranch _owner )
+ public Xcls_actioncellrenderer(MergeBranch _owner )
{
_this = _owner;
- _this.dbcellrenderer = this;
+ _this.actioncellrenderer = this;
this.el = new Gtk.CellRendererText();
// my vars (dec)
// user defined functions
}
- public class Xcls_dbmodel : Object
+ public class Xcls_actionmodel : Object
{
public Gtk.ListStore el;
private MergeBranch _this;
// my vars (def)
// ctor
- public Xcls_dbmodel(MergeBranch _owner )
+ public Xcls_actionmodel(MergeBranch _owner )
{
_this = _owner;
- _this.dbmodel = this;
+ _this.actionmodel = this;
this.el = new Gtk.ListStore( 2, typeof(string),typeof(string) );
// my vars (dec)
}
// user defined functions
- public void loadTickets () {
+ public void loadActions () {
- RooTicket.singleton().loadTickets();
+
- _this.ticketsel.loading = true;
+ _this.actionsel.loading = true;
this.el.clear();
Gtk.TreeIter iter;
el.set_value(iter, 0, "");
- el.set_value(iter, 1, "-- select a ticket --");
+ el.set_value(iter, 1, "-- select action --");
- _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));
+ _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");
- //if (data.get(i) == cur) {
- // _this.build_module.el.set_active_iter(iter);
- // }
- }
+ 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");
- _this.ticketsel.loading = false;
+ 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);
}
if (this.loading) {
return;
}
- var ticket_id = this.selectedTicketId();
-
- var name = RooTicket.singleton().usernameLocal();
- if (ticket_id == "" || ticket_id == null) {
-
- var dt = new DateTime.now_local();
- _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
- return;
- }
-
-
- var ticket = RooTicket.singleton().getById(ticket_id);
-
- _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+
+ _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 void loadTickets () {
- RooTicket.singleton().loadTickets();
+ RooTicket.singleton().loadTickets("",RooTicket.NotMe.FALSE, RooTicket.Closed.FALSE);
_this.ticketsel.loading = true;
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);
+
+ if (_this.ticket != null && _this.ticket.id == "-1") {
+ el.append(out iter);
+ el.set_value(iter, 0, "-1");
+ el.set_value(iter, 1, "Temporary Branch - No ticket specified/relivant");
+ _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 (data.get(i) == cur) {
- // _this.build_module.el.set_active_iter(iter);
- // }
+ if (_this.ticket != null && _this.ticket.id == ticket.id) {
+ _this.ticketsel.el.set_active_iter(iter);
+ }
}
public Xcls_Label12(MergeBranch _owner )
{
_this = _owner;
- this.el = new Gtk.Label( "or use this as branch name" );
+ this.el = new Gtk.Label( "Use this commit message" );
// my vars (dec)
}
// 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.
+ }
+
+ }
}
// set gobject values
this.el.relief = Gtk.ReliefStyle.NONE;
- this.el.label = "Do not create Branch";
+ this.el.label = "Cancel";
}
// user defined functions
// my vars (dec)
// set gobject values
- this.el.label = "Create Branch";
+ this.el.label = "Do Merge";
}
// user defined functions
projects / gitlive / blobdiff