public class GitRepo : Object
{
+ public Array<GitMonitorQueue> cmds;
+ public string gitdir;
+ public string git_working_dir;
+ public bool debug = false;
+
/**
* index of.. matching gitpath..
*/
- public static int indexOfAdd( Array<GitRepo> repos, string gitpath) {
+ public static int indexOf( Array<GitRepo> repos, string gitpath) {
+ // make a fake object to compare against..
+ var test_repo = new GitRepo(gitpath);
+
for(var i =0; i < repos.length; i++) {
- if (reos.index(i).gitpath == add) {
+ if (repos.index(i).gitdir == test_repo.gitdir) {
return i;
}
}
return -1;
}
-
-
-
- public Array<GitMontitorQueue> cmds;
-
-
- public string gitdir;
+
+
/**
* constructor:
*
public GitRepo(string path) {
// cal parent?
-
+ this.git_working_dir = path;
this.gitdir = path + "/.git";
- if (!GLib.file_test(this.gitdir , GLib.FileTest.IS_DIR)) {
+ if (!FileUtils.test(this.gitdir , FileTest.IS_DIR)) {
this.gitdir = path; // naked...
}
- this.cmds = new Array<GitMontitorQueue> ();
+ this.cmds = new Array<GitMonitorQueue> ();
//Repo.superclass.constructor.call(this,cfg);
}
*
* @argument {Array} files the files to add.
*/
- public string add ( Array<GitMontitorQueue> files )
+ public string add ( Array<GitMonitorQueue> files ) throws Error, SpawnError
{
// should really find out if these are untracked files each..
// we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
// not sure if that is how git works.. but just be certian.
+ var ret = "";
for (var i = 0; i < files.length;i++) {
- var f = files.item(i);
+ var f = files.index(i).vname;
try {
- this.git( { "add", f });
+ string[] cmd = { "add", f };
+ this.git( cmd );
} catch (Error e) {
ret += e.message + "\n";
}
}
+ return ret;
}
/**
*
* @argument {Array} files the files to add.
*/
- public string remove ( Array<GitMontitorQueue> files )
+ public string remove ( Array<GitMonitorQueue> files ) throws Error, SpawnError
{
// this may fail if files do not exist..
// should really find out if these are untracked files each..
var ret = "";
for (var i = 0; i < files.length;i++) {
- var f = files.item(i);
+ var f = files.index(i).vname;
try {
- this.git( { "rm", "-f" , f });
+ string[] cmd = { "rm", "-f" , f };
+ this.git( cmd );
} catch (Error e) {
ret += e.message + "\n";
}
*
*/
- public string commit ( string message, Array<GitMontitorQueue> files )
+ public string commit ( string message, Array<GitMonitorQueue> files ) throws Error, SpawnError
{
}
*/
- var args = { "commit", "-m", message.length > 0 ? message : "Changed" };
+ string[] args = { "commit", "-m" };
+ args += (message.length > 0 ? message : "Changed" );
for (var i = 0; i< files.length ; i++ ) {
- args += files.items(i).path; // full path?
+ args += files.index(i).vname; // full path?
}
- return this.git(args, env);
+ return this.git(args);
}
/**
* -- maybe later it will have a few options and do more stuff..
*
*/
- public string pull ()
+ public string pull () throws Error, SpawnError
{
// should probably hand error conditions better...
- return this.git({ "pull" });
+ string[] cmd = { "pull" };
+ return this.git( cmd );
+
}
* -- maybe later it will have a few options and do more stuff..
*
*/
- public string push ()
+ public string push () throws Error, SpawnError
{
// should
return this.git({ "push" });
*
*/
- public string git(string[] args_in, string[] env = {})
+ public string git(string[] args_in ) throws Error, SpawnError
{
// convert arguments.
- var args = {
- "git",
- "--git-dir", this.gitdir,
- "--no-pager",
- };
+ 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 = i; i < args_in.length;i++) {
+ //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) {
-
- print( string.joinv (", ", args_list););
- }
-
- env += ("HOME=" + GLib.get_home_dir() );
+ //if(this.debug) {
+ stdout.printf( "CWD=%s\n", this.git_working_dir );
+ print( 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.repopath, args , env);
+
+ var cfg = new SpawnConfig(this.git_working_dir , args , env);
// may throw error...
var sp = new Spawn(cfg);
-
- //print("GOT: " + output)
+
+ stdout.printf( "GOT: %s\n" , sp.output);
// parse output for some commands ?
return sp.output;
}
projects / gitlive / blobdiff