cache.set( path, this);
}
this.loadBranches();
+ this.loadActiveTicket();
}
public bool is_wip_branch()
{
return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
}
+
+ public bool is_auto_branch ()
+ {
+ return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
+ }
public bool is_autopush ()
{
return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
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);
+
+
+ }
+
+
- public bool setActiveTicket(RooTicket ticket, string branchname)
+ public bool setActiveTicket(RooTicket? ticket, string branchname)
{
if (!this.createBranchNamed(branchname)) {
return false;
}
- FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
+ if (ticket != null) {
+ FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
+ } else {
+ FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
+ }
this.activeTicket = ticket;
return true;
}
string[] cmd = { "checkout", "-b" , branchname };
this.git(cmd);
-
this.push();
+ cmd = { "branch", "--set-upstream-to=origin/"+branchname , branchname };
+ this.git(cmd);
+
} catch(Error ee) {
GitMonitor.gitmonitor.pauseError(ee.message);
return false;
this.loadBranches(); // update branch list...
- GitMonitor.gitmonitor.runQueue(); // commit any outstanding...
+ //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
return true;
}