cache.set( path, this);
}
this.loadBranches();
+ this.loadActiveTicket();
}
public bool is_wip_branch()
try {
var oldbranch = this.currentBranch.name;
this.setActiveTicket(null, "master");
- string [] cmd = { "merge", "--squash", oldbranch };
- this.git( cmd );
- cmd = { "commit", "-a" , "-m", commit_message };
- this.git( cmd );
- this.push();
- this.loadBranches(); // updates lastrev..
+ string [] cmd = { "merge", "--squash", oldbranch };
+ this.git( cmd );
+ cmd = { "commit", "-a" , "-m", commit_message };
+ this.git( cmd );
+ this.push();
+ this.loadBranches(); // updates lastrev..
- var notification = new Notify.Notification(
+ var notification = new Notify.Notification(
"Merged branch %s to master".printf(oldbranch),
"",
"dialog-information"
}
return false;
}
+
+ public void loadActiveTicket()
+ {
+ this.activeTicket = null;
+ if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
+ return;
+ }
+ string ticket_id;
+ FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
+ if (ticket_id.length < 1) {
+ return;
+ }
+ this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
+
+
+ }
+
- public bool setActiveTicket(RooTicket ticket, string branchname)
+ public bool setActiveTicket(RooTicket? ticket, string branchname)
{
if (!this.createBranchNamed(branchname)) {
return false;
public string push () throws Error, SpawnError
{
// should
- return this.git({ "push", "--all" });
+ return this.git({ "push" });
}