X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Clones.vala;h=d4c267b98c2ceee3bd01f9ace9028116504561f5;hb=128c96fc9db69baca7ba185e8a3def8fddff5f27;hp=fba05f5c3f29f28fecacb2dd659aa80c1de1c2bf;hpb=c1ad70290a106c4ba503d1cd77494fbde6cf965d;p=gitlive diff --git a/Clones.vala b/Clones.vala index fba05f5c..d4c267b9 100644 --- a/Clones.vala +++ b/Clones.vala @@ -464,7 +464,7 @@ public class Clones : Object // } catch(e) { print(e);} this.el.set_value(iter, 0, repo.name ); - this.el.set_value( iter, 1, repo.currentBranch.name ); + this.el.set_value( iter, 1, repo.getCurrentBranch().name ); this.el.set_value( iter, 2, repo.branchesToString() ); // this.el.set_value(ret.iter, 2, '' + repo.branches.map( // function(e) { return e.name; @@ -475,24 +475,24 @@ public class Clones : Object this.el.set_value(iter, 5, repo.is_autopush() ); this.el.set_value(iter, 6, repo.git_working_dir ); // highlight color. - var cb = repo.currentBranch; + var cb = repo.getCurrentBranch(); //print(JSON.stringify(cb,null,4)); var col = "#ffffff"; if (cb.lastrev != cb.remoterev) { col = "#f2dede"; - this.el.set_value( iter, 1, repo.currentBranch.name +"\n" + + this.el.set_value( iter, 1, repo.getCurrentBranch().name +"\n" + (repo.ahead_or_behind == "B" ? "Local is BEHIND remote" : "Local is AHEAD of remote") ); } if (repo.has_local_changes) { col = "#d9edf7"; - this.el.set_value( iter, 1, repo.currentBranch.name +"\nHas uncommitted changes" ); + this.el.set_value( iter, 1, repo.getCurrentBranch().name +"\nHas uncommitted changes" ); } if ((cb.lastrev != cb.remoterev) && (repo.has_local_changes)) { col = "#fcf8e3"; - this.el.set_value( iter, 1, repo.currentBranch.name +"\n" + + this.el.set_value( iter, 1, repo.getCurrentBranch().name +"\n" + (repo.ahead_or_behind == "B" ? "Local is BEHIND remote" : "Local is AHEAD of remote") + "\nHas uncommitted changes" ); }