}
return _GitRepo;
}
-
+
/**
* index of.. matching gitpath..
*/
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);
}
GitMonitor.gitmonitor.start();
}
-
-
-
+
public bool doMerge(string action, string ticket_id, string commit_message)
{
var ret = "";
if (action == "CLOSE" || action == "LEAVE") {
-
try {
- var oldbranch = this.currentBranch.name;
- this.setActiveTicket(null, "master");
- string [] cmd = { "merge", "--squash", oldbranch };
- this.git( cmd );
- cmd = { "commit", "--m", commit_message };
- this.git( cmd );
- this.loadBranches(); // updates lastrev..
+ 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..
- 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;
}
- 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;
}
public bool createBranchNamed(string branchname)
{
-
+ var stash = false;
if (this.branches.has_key(branchname)) {
// this is where it get's tricky...
try {
string[] cmd = { "ls-files" , "-m" }; // list the modified files..
var ret = this.git(cmd);
- var stash = ret.length> 1 ;
+ stash = ret.length> 1 ;
cmd = { "stash" };
} catch(Error e) {
GitMonitor.gitmonitor.pauseError(e.message);
return false;
-
}
try {
- cmd = { "merge", "master" };
- this.git(cmd);
+ if (branchname != "master") {
+ string[] cmd = { "merge", "master" };
+ this.git(cmd);
+ this.push();
+ //cmd = { "commit", "-a" , "-m", "merge master changes" };
+ //git chethis.git( cmd );
+ }
+
} catch(Error e) {
- try {
- cmd = { "mergetool" };
- this.git(cmd);
- cmd = { "commit" "-m" "Fix merge conflicts from master" };
- this.git(cmd);
- } catch(Error ee) {
- GitMonitor.gitmonitor.pauseError(ee.message);
- return false;
- }
+ string[] cmd = { "checkout", "master" };
+ this.git(cmd);
+ GitMonitor.gitmonitor.pauseError(
+ "Use\n\na) git checkout %s\nb) git mergetool\nc) git commit\nd) git push\n d) stash pop \ne) start gitlive again\n".printf(
+ branchname)
+ + e.message
+ );
+ return false;
+
}
- try {
- cmd = { "stash", "pop" };
+ try {
+ string[] cmd = { "stash", "pop" };
if (stash) { this.git(cmd); }
} catch(Error ee) {
GitMonitor.gitmonitor.pauseError(ee.message);
return false;
}
-
+ this.push();
} else {
try {
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;
notification.set_timeout(5);
notification.show();
-
- } catch(Error e) {
- GitMonitor.gitmonitor.pauseError(e.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;
}
public string push () throws Error, SpawnError
{
// should
- return this.git({ "push", "origin", "HEAD" });
+ return this.git({ "push" });
}