X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitRepo.vala;h=5c866c32b48740e04b659978a804b55cac19abb0;hb=a395b6b09677f19eb25a27479d7591d65353d744;hp=a81316725cb9994882efc38c04b997bbad95d169;hpb=51adde56c5c324a4d8ce5e4ed3bdb2fe094fd336;p=gitlive diff --git a/GitRepo.vala b/GitRepo.vala index a8131672..5c866c32 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -206,10 +206,15 @@ public class GitRepo : Object public string get_config(string key) { - return this.git({ "config" , "gitlive." + key }); + try { + return this.git({ "config" , "gitlive." + key }); + } catch (Error e) { + return ""; // happens when there is nothing set... + } + } - public string set_config(string key, string value) { - return this.git({ "config" , "gitlive." + key, value }); + public void set_config(string key, string value) { + this.git({ "config" , "gitlive." + key, value }); } public bool is_managed() @@ -428,11 +433,7 @@ public class GitRepo : Object if (!this.createBranchNamed(branchname)) { return false; } - if (ticket != null) { - FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id); - } else { - FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" ); - } + this.set_config("ticket", ticket == null ? "": ticket.id); this.activeTicket = ticket; return true; } @@ -776,6 +777,8 @@ public class GitRepo : Object // may throw error... var sp = new Spawn(cfg); + //GLib.debug( "GOT result: %d" , sp.result); + // diff output is a bit big.. if (args_in[0] != "diff") { GLib.debug( "GOT: %s" , sp.output); @@ -877,7 +880,9 @@ public class GitRepo : Object repo.loadStatus(); update_all_total--; + GLib.debug("calls remaining = %d", update_all_total); if (update_all_total > 0 ) { + return; } switch (update_all_after) {