X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=6954437cd13cc3971096b4128846e211125717ef;hp=df1345bce643007b37a85275cfba6fce0a29d7a4;hb=refs%2Fheads%2Fwip_alan_T5632_cache_project_listing;hpb=ecaffc9070026df0af77c7b5d12a7facb6d479c7 diff --git a/GitRepo.vala b/GitRepo.vala index df1345bc..6954437c 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -18,12 +18,21 @@ public class GitRepo : Object public string gitdir; public string git_working_dir; public bool debug = false; + public bool has_local_changes = false; + public string host = ""; + public string git_status; + public string git_diff; + public string ahead_or_behind = ""; public Gee.HashMap ignore_files; public GitBranch currentBranch; - + public Gee.HashMap branches; // accessed in GitBranch.. public RooTicket? activeTicket; - + public Gee.HashMap cache; + public Gee.HashMap config_cache; + + + public static GitRepo singleton() { if (_GitRepo == null) { @@ -49,7 +58,7 @@ public class GitRepo : Object } - public Gee.HashMap cache; + @@ -124,9 +133,7 @@ public class GitRepo : Object } return list_cache; - - } public static GitRepo get(string path) @@ -149,7 +156,8 @@ public class GitRepo : Object * */ - private GitRepo(string path) { + private GitRepo(string path) + { // cal parent? this.name = File.new_for_path(path).get_basename(); this.ignore_files = new Gee.HashMap(); @@ -166,46 +174,132 @@ public class GitRepo : Object if ( !cache.has_key(path) ) { cache.set( path, this); } + + var r = this.git({ "remote" , "get-url" , "--push" , "origin"}); + var uri = new Soup.URI(r); + this.host = uri.get_host(); + this.init_config(); + this.loadBranches(); + this.loadActiveTicket(); + this.loadStatus(); } - public bool is_wip_branch() + public bool is_master_branch() { - return this.currentBranch.name.has_prefix("wip_"); + // special branches that do not allow autopushing now... + return this.currentBranch.name == "master" || this.currentBranch.name == "roojs"; } + public void init_config() + { + this.config_cache = new Gee.HashMap(); + // managed = + if (this.get_config("managed") == "") { + this.set_config("managed", this.host == "git.roojs.com" ? "1" : "0"); + } + if (this.get_config("autocommit") == "") { + this.set_config("autocommit", this.host == "git.roojs.com" ? "1" : "0"); + } + if (this.get_config("autopush") == "") { + this.set_config("autopush", this.host == "git.roojs.com" ? "1" : "0"); + } + + } + + + + public string get_config(string key) { + + if (this.config_cache.has_key(key)) { + //GLib.debug("get_config %s = '%s'", key, this.config_cache.get(key)); + return this.config_cache.get(key); + } + try { + var ret = this.git({ "config" , "gitlive." + key }).strip(); + this.config_cache.set(key, ret); + //GLib.debug("get_config %s = '%s'", key, ret); + return ret; + } catch (Error e) { + this.config_cache.set(key, ""); + //GLib.debug("get_config (fail) %s = '%s'", key, ""); + return ""; // happens when there is nothing set... + } + + } + public void set_config(string key, string value) { + this.git({ "config" , "gitlive." + key, value }); + this.config_cache.set(key,value); + } + + public bool is_managed() + { + return this.get_config("managed") == "1"; + } + public bool is_autocommit () + { + return this.get_config("autocommit") == "1"; + } + + public void set_autocommit(bool val) { - return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS); + this.set_config("autocommit", val ? "1" : "0"); + + } + + public bool is_auto_branch () + { + if (this.name == "gitlog") { + return false; + } + // check remote... + if (this.is_managed()) { + return true; + } + return false; + + + } + + public void set_auto_branch(bool val) + { + if (this.name == "gitlog") { + return; + } + this.set_config("managed", val ? "1" : "0"); + } public bool is_autopush () { - return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS); + return this.get_config("autopush") == "1"; } + public void set_autopush(bool val) + { + this.set_config("autopush", val ? "1" : "0"); + } + - Gee.HashMap branches; + public void loadStatus() + { + var r = this.git({ "status" , "--porcelain" }); + this.git_status = r; + this.has_local_changes = r.length > 0; + + var rs = this.git({ "status" , "-sb" }); + + this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : ""); + + + this.git_diff = this.git({ "diff" , "HEAD", "--no-color" }); + } + public void loadBranches() { - this.branches = new Gee.HashMap(); - - string[] cmd = { "branch", "--no-color", "--verbose", "--no-abbrev" , "-a" }; - var res = this.git( cmd ); - var lines = res.split("\n"); - for (var i = 0; i < lines.length ; i++) { - var br = new GitBranch(this); - if (!br.parseBranchListItem(lines[i])) { - continue; - } - GLib.debug("add branch %s", br.realName()); - - branches.set(br.realName(), br); - if (br.active) { - this.currentBranch = br; - } - } - + + GitBranch.loadBranches(this); } @@ -218,7 +312,7 @@ public class GitRepo : Object if (br.name == "") { continue; } - ret += ret.length > 0 ? "," : ""; + ret += ret.length > 0 ? "\n" : ""; ret += br.name; } @@ -259,14 +353,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" @@ -332,14 +426,29 @@ public class GitRepo : Object } return false; } + + public void loadActiveTicket() + { + this.activeTicket = null; + var ticket_id = this.get_config("ticket"); + + 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) { + this.set_config("ticket", ""); if (!this.createBranchNamed(branchname)) { return false; } - FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id); + this.set_config("ticket", ticket == null ? "": ticket.id); this.activeTicket = ticket; return true; } @@ -347,63 +456,12 @@ public class GitRepo : Object 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); - stash = ret.length> 1 ; - - - cmd = { "stash" }; - if (stash) { this.git(cmd); } - - 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); - cmd = { "commit", "-a" , "-m", "merge master changes" }; - this.git( cmd ); - } - } 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); } - } catch(Error ee) { - GitMonitor.gitmonitor.pauseError(ee.message); - return false; - } - this.push(); + this.switchToExistingBranchNamed(branchname); } else { - try { - - string[] cmd = { "checkout", "-b" , branchname }; - this.git(cmd); - - this.push(); - } catch(Error ee) { - GitMonitor.gitmonitor.pauseError(ee.message); - return false; - } + this.createNewBranchNamed(branchname); } var notification = new Notify.Notification( @@ -418,9 +476,110 @@ public class GitRepo : Object this.loadBranches(); // update branch list... - GitMonitor.gitmonitor.runQueue(); // commit any outstanding... + //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue.. return true; } + bool switchToExistingBranchNamed(string branchname) + { + 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; + + } + /** @@ -565,7 +724,7 @@ public class GitRepo : Object public void pull_async(GitAsyncCallback cb) { - string[] cmd = { "pull" , "--no-edit" }; + string[] cmd = { "pull" , "--no-edit" }; this.git_async( cmd , cb); @@ -582,7 +741,7 @@ public class GitRepo : Object public string push () throws Error, SpawnError { // should - return this.git({ "push", "--all" }); + return this.git({ "push" }); } @@ -626,16 +785,19 @@ public class GitRepo : Object //if (File.exists(this.repo + '/.git/config')) { //env.push("GITPATH=" + this.repo ); //} - - + var cfg = new SpawnConfig(this.git_working_dir , args , env); - + //cfg.debug = true; // may throw error... var sp = new Spawn(cfg); - - GLib.debug( "GOT: %s" , sp.output); + //GLib.debug( "GOT result: %d" , sp.result); + + // diff output is a bit big.. + if (args_in[0] != "diff") { + GLib.debug( "GOT: %s" , sp.output); + } // parse output for some commands ? return sp.output; } @@ -696,4 +858,61 @@ public class GitRepo : Object } + + + + + public void update_async(GitAsyncCallback cb) + { + string[] cmd = { "fetch" , "--all" }; + this.git_async( cmd , cb); + + } + + + static uint update_all_total = 0; + static string update_all_after = ""; + + public static void updateAll(string after) + { + update_all_after = after; + var tr = GitRepo.singleton().cache; + + + update_all_total = tr.size; + foreach(var repo in tr.values) { + if (!repo.is_managed()) { + update_all_total--; + continue; + } + repo.update_async(updateAllCallback); + } + GLib.debug("calls total = %d", (int) update_all_total); + } + public static void updateAllCallback(GitRepo repo, int err, string res) + { + repo.loadBranches(); + repo.loadStatus(); + + update_all_total--; + GLib.debug("calls remaining = %d", (int)update_all_total); + if (update_all_total > 0 ) { + + return; + } + GLib.debug("call after load = %s", update_all_after); + + switch (update_all_after) { + case "show_clones": + Clones.singleton().show(); + break; + default: + GLib.debug("Unkown call after load = %s", update_all_after); + break; + } + return; + } + + + }