X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitRepo.vala;h=951a46f5a863c6ff18d005f27e31b182c1ac7e74;hb=a1425bc37e1984ffa3215a1b5cc6021b4f6430d0;hp=36dca8a3187cea753e1afdc0e861a9252b465a58;hpb=665284cd868b225f8d8876475898e36b3a722051;p=gitlive diff --git a/GitRepo.vala b/GitRepo.vala index 36dca8a3..951a46f5 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -193,10 +193,14 @@ public class GitRepo : Object { // managed = if (this.get_config("managed") == "") { - this.set_config("managed", this.host != "git.roojs.com" ? "1" : "0"); + 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"); } - - } @@ -210,37 +214,18 @@ public class GitRepo : Object public bool is_managed() { - // is it a roojs origin? - - if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed. - var r = this.git({ "config" , "gitlive.managed"); - - return FileUtils.test(this.gitdir + "/.gitlive-managed" , FileTest.EXISTS); - } - // otherwise see if unmanaged is set to disable it.. - return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS); - + return this.get_config("managed") == "1"; } public bool is_autocommit () { - return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS); + return this.get_config("autocommit") == "1"; } + public void set_autocommit(bool val) { - - var cur = this.is_autocommit(); - GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF"); - if (cur == val) { - return; // no change.. - } - if (!val) { - FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x"); - } else { - // it exists... - FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" ); - } + this.set_config("autocommit", val ? "1" : "0"); } @@ -260,35 +245,15 @@ public class GitRepo : Object public void set_auto_branch(bool val) { - - var cur = this.is_auto_branch(); - GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF"); - - if (cur == val) { - return; // no change.. - } - if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed. - // remote is not our server.. - if (val) { - FileUtils.set_contents(this.gitdir + "/.gitlive-managed" , "x"); - } else { - FileUtils.remove(this.gitdir + "/.gitlive-managed" ); - } + if (this.name == "gitlog") { return; - - } - - if (val) { - FileUtils.remove(this.gitdir + "/.gitlive-unmanaged" ); - } else { - FileUtils.set_contents(this.gitdir + "/.gitlive-unmanaged" , "x"); - } - + this.set_config("managed", val ? "1" : "0"); } public bool is_autopush () { + return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS); } public void set_autopush(bool val)