X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=4e018e547b12347508e44dcf9b9e84cfab574443;hp=14064cc7586939660aa8a2a2b4f8d0ec6723fbc9;hb=265adcf86cbf103f51c08f6a02ba486633b148b0;hpb=89ccf6795c52f050c701916460c7f279d839c3b7 diff --git a/GitRepo.vala b/GitRepo.vala index 14064cc7..4e018e54 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -7,22 +7,37 @@ * * */ +static GitRepo _GitRepo; + public class GitRepo : Object { - + public Array cmds; public string name; public string gitdir; public string git_working_dir; public bool debug = false; + + public Gee.HashMap ignore_files; + public GitBranch currentBranch; + + + public static GitRepo singleton() + { + if (_GitRepo == null) { + _GitRepo = new GitRepo(); + _GitRepo.cache = new Gee.HashMap(); + } + return _GitRepo; + } /** * index of.. matching gitpath.. */ public static int indexOf( Array repos, string gitpath) { // make a fake object to compare against.. - var test_repo = new GitRepo(gitpath); + var test_repo = GitRepo.get(gitpath); for(var i =0; i < repos.length; i++) { if (repos.index(i).gitdir == test_repo.gitdir) { @@ -33,16 +48,18 @@ public class GitRepo : Object } - + public Gee.HashMap cache; + + public static Array list() { - + //if (GitRepo.list_cache != null) { // unowned Array ret = GitRepo.list_cache; // return ret; //} - + var cache = GitRepo.singleton().cache; var list_cache = new Array(); var dir = Environment.get_home_dir() + "/gitlive"; @@ -60,7 +77,7 @@ public class GitRepo : Object return list_cache; } - + FileInfo next_file; while (true) { @@ -72,7 +89,7 @@ public class GitRepo : Object } } catch (Error e) { - print("Error: %s\n",e.message); + GLib.debug("Error: %s",e.message); break; } @@ -100,8 +117,8 @@ public class GitRepo : Object continue; } - list_cache.append_val(new GitRepo( sp )) ; - + var rep = GitRepo.get( sp ); + list_cache.append_val(rep); } @@ -109,7 +126,17 @@ public class GitRepo : Object -} + } + + public static GitRepo get(string path) + { + var cache = GitRepo.singleton().cache; + if (cache.has_key(path)) { + return cache.get(path); + } + return new GitRepo(path); + } + @@ -121,10 +148,10 @@ public class GitRepo : Object * */ - public GitRepo(string path) { + private GitRepo(string path) { // cal parent? this.name = File.new_for_path(path).get_basename(); - + this.ignore_files = new Gee.HashMap(); this.git_working_dir = path; this.gitdir = path + "/.git"; @@ -132,9 +159,78 @@ public class GitRepo : Object this.gitdir = path; // naked... } this.cmds = new Array (); - //Repo.superclass.constructor.call(this,cfg); + var cache = GitRepo.singleton().cache; + //Repo.superclass.constructor.call(this,cfg); + if ( !cache.has_key(path) ) { + cache.set( path, this); + } } + + + public bool is_autocommit () + { + return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS); + } + public bool is_autopush () + { + return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS); + } + + Gee.HashMap branches; + + 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; + } + } + + } + public string branchesToString() + { + var ret = ""; + foreach( var br in this.branches.values) { + if (br.name == "") { + continue; + } + ret += ret.length > 0 ? "," : ""; + ret += br.name; + + } + return ret; + + } + RooTicket? ticket = null; + + public void setActiveTicket(RooTicket ticket, string branchname) + { + this.createBranchNamed(branchname); + FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id); + this.activeTicket = ticket; + } + + public void createBranchNamed(string branchname) + { + string[] cmd = { "checkout", "-b" , branchname }; + this.git(cmd); + this.loadBranches(); // update branch list... + } + + /** * add: * add files to track. @@ -159,6 +255,28 @@ public class GitRepo : Object } return ret; } + + public bool is_ignore(string fname) throws Error, SpawnError + { + if (fname == ".gitignore") { + this.ignore_files.clear(); + } + + if (this.ignore_files.has_key(fname)) { + return this.ignore_files.get(fname); + } + + try { + var ret = this.git( { "check-ignore" , fname } ); + this.ignore_files.set(fname, ret.length > 0); + return ret.length > 0; + } catch (SpawnError e) { + this.ignore_files.set(fname, false); + return false; + } + + } + /** * remove: @@ -188,6 +306,7 @@ public class GitRepo : Object } + /** * commit: * perform a commit. @@ -248,8 +367,18 @@ public class GitRepo : Object return this.git( cmd ); - } + + public delegate void GitAsyncCallback (GitRepo repo, int err, string str); + public void pull_async(GitAsyncCallback cb) + { + + string[] cmd = { "pull" , "--no-edit" }; + this.git_async( cmd , cb); + + + } + /** * push: * Send local changes to remote repo(s) @@ -261,9 +390,12 @@ public class GitRepo : Object public string push () throws Error, SpawnError { // should - return this.git({ "push" }); + return this.git({ "push", "origin", "HEAD" }); } + + + /** * git: * The meaty part.. run spawn.. with git.. @@ -275,13 +407,12 @@ public class GitRepo : Object { // convert arguments. - string[] args = { "git" }; //args += "--git-dir"; //args += this.gitdir; args += "--no-pager"; - + //if (this.gitdir != this.repopath) { // args += "--work-tree"; // args += this.repopath; @@ -292,8 +423,8 @@ public class GitRepo : Object //this.lastCmd = args.join(" "); //if(this.debug) { - stdout.printf( "CWD=%s\n", this.git_working_dir ); - print( "cmd: %s\n", string.joinv (" ", args)); + GLib.debug( "CWD=%s", this.git_working_dir ); + GLib.debug( "cmd: %s", string.joinv (" ", args)); //} string[] env = {}; @@ -310,10 +441,67 @@ public class GitRepo : Object // may throw error... var sp = new Spawn(cfg); + - stdout.printf( "GOT: %s\n" , sp.output); + GLib.debug( "GOT: %s" , sp.output); // parse output for some commands ? return sp.output; } + + unowned GitAsyncCallback git_async_on_callback; + public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError + { + // convert arguments. + this.git_async_on_callback = cb; + string[] args = { "git" }; + //args += "--git-dir"; + //args += this.gitdir; + args += "--no-pager"; + + + //if (this.gitdir != this.repopath) { + // args += "--work-tree"; + // args += this.repopath; + //} + for (var i = 0; i < args_in.length;i++) { + args += args_in[i]; + } + //this.lastCmd = args.join(" "); + //if(this.debug) { + GLib.debug( "CWD=%s", this.git_working_dir ); + //print( "cmd: %s\n", string.joinv (" ", args)); + //} + + string[] env = {}; + string home = "HOME=" + Environment.get_home_dir() ; + env += home ; + // do not need to set gitpath.. + //if (File.exists(this.repo + '/.git/config')) { + //env.push("GITPATH=" + this.repo ); + //} + + + var cfg = new SpawnConfig(this.git_working_dir , args , env); + cfg.async = true; + + + // may throw error... + var sp = new Spawn(cfg); + //sp.ref(); + //this.ref(); + sp.run(this.git_async_on_complete); + + } + + void git_async_on_complete(int err, string output) + { + GLib.debug("GOT %d : %s", err, output); + this.git_async_on_callback(this, err, output); +// this.unref(); + // sp.unref(); + + + } + }