projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c47d1f0
)
sync
author
Alan Knowles
<alan@roojs.com>
Tue, 6 Nov 2018 05:12:45 +0000
(13:12 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 6 Nov 2018 05:12:45 +0000
(13:12 +0800)
GitRepo.vala
patch
|
blob
|
history
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
0a50944
..
5c19f07
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-167,6
+167,7
@@
public class GitRepo : Object
cache.set( path, this);
}
this.loadBranches();
cache.set( path, this);
}
this.loadBranches();
+ this.loadActiveTicket();
}
public bool is_wip_branch()
}
public bool is_wip_branch()
@@
-264,14
+265,14
@@
public class GitRepo : Object
try {
var oldbranch = this.currentBranch.name;
this.setActiveTicket(null, "master");
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"
"Merged branch %s to master".printf(oldbranch),
"",
"dialog-information"
@@
-338,6
+339,23
@@
public class GitRepo : Object
return false;
}
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)
{