From 8f2e926941f05c2102697de8005d4b1954a6ea4f Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 6 Nov 2018 13:12:45 +0800 Subject: [PATCH] sync --- GitRepo.vala | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/GitRepo.vala b/GitRepo.vala index 0a509443..5c19f071 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -167,6 +167,7 @@ public class GitRepo : Object cache.set( path, this); } this.loadBranches(); + this.loadActiveTicket(); } public bool is_wip_branch() @@ -264,14 +265,14 @@ public class GitRepo : Object 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" @@ -338,6 +339,23 @@ public class GitRepo : Object 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) { -- 2.39.2