+ bool switchToExistingBranchNamed(string branchname)
+ {
+ var master = this.hasBranchCalled("roojs") ? "roojs" : "master";
+ var stash = false;
+ // this is where it get's tricky...
+ string files = "";
+ try {
+ string[] cmd = { "ls-files" , "-m" }; // list the modified files..
+ files = this.git(cmd);
+ stash = files.length> 1 ;
+
+
+ cmd = { "stash" };
+ if (stash) { this.git(cmd); }
+
+ this.pull();
+
+ cmd = { "checkout", branchname };
+ this.git(cmd);
+ } catch(Error e) {
+ GitMonitor.gitmonitor.pauseError(e.message);
+ return false;
+ }
+ try {
+ if (branchname != master) {
+ string[] cmd = { "merge", master };
+ this.git(cmd);
+ this.push();
+
+ }
+
+ } catch(Error e) {
+ 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 {
+ string[] cmd = { "stash", "pop" };
+ if (stash) {
+ this.git(cmd);
+ var fl = files.split("\n");
+ cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
+ foreach(var f in fl) {
+ if (f.length < 1) continue;
+ cmd += f;
+ }
+ this.git(cmd);
+ }
+
+
+
+ } catch(Error ee) {
+ GitMonitor.gitmonitor.pauseError(ee.message);
+ return false;
+ }
+ this.push();
+ return true;
+
+ }
+
+
+
+ bool createNewBranchNamed(string branchname)
+ {
+ var stash = false;
+ try {
+ string[] cmd = { "ls-files" , "-m" }; // list the modified files..
+ var files = this.git(cmd);
+ stash = files.length> 1 ;
+
+ cmd = { "checkout", "-b" , branchname };
+ this.git(cmd);
+
+ cmd = { "push", "-u" , "origin" ,"HEAD" };
+ this.git(cmd);
+ if (stash) {
+
+ var fl = files.split("\n");
+ cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
+ foreach(var f in fl) {
+ if (f.length < 1) continue;
+ cmd += f;
+ }
+ this.git(cmd);
+ this.push();
+ }
+
+
+ } catch(Error ee) {
+ GitMonitor.gitmonitor.pauseError(ee.message);
+ return false;
+ }
+ return true;
+
+ }
+
+ public static string previewMerges(string ticket_id)
+ {
+ var ret = "";
+ foreach(var repo in GitRepo.singleton().cache.values) {
+ if (repo.activeTicket == null || repo.activeTicket.id != ticket_id) {
+ continue;
+ }
+ ret += repo.previewMerge() + "\n\n";
+
+ }
+ return ret;
+
+ }
+
+
+
+ public string previewMerge()
+ {
+ try {
+ var master = this.hasBranchCalled("roojs") ? "roojs" : "master";
+ var lines = this.git({"log", master + "...", "--pretty=format:%H %P" }).split("\n");;
+ var head = this.git({"log", "-1", "--pretty=format:%H %P" });
+ var start = head.split(" ")[0];
+ var end = "";
+ for (var i = 0; i < lines.length; i++) {
+ var cols = lines[i].split(" ");
+ if (cols.length > 2) {
+ end = cols[0];
+ break;
+ }
+ }
+ if (end == "") {
+ var last = lines[lines.length-1];
+ end = last.split(" ")[1];
+ }
+
+ return this.git({ "diff" , (end+".."+start), "--no-color" });
+ } catch(Error ee) {
+ GitMonitor.gitmonitor.pauseError(ee.message);
+ return "Error getting diff";
+ }
+
+
+ }
+