public Gee.HashMap<string,bool> ignore_files;
- public GitBranch currentBranch;
+ public GitBranch _currentBranch;
+ public GitBranch getCurrentBranch() {
+ if (this._currentBranch == null) {
+ this.loadBranches();
+ }
+ if (this._currentBranch == null) {
+ GLib.error("could not work out current branch?");
+ }
+ return this._currentBranch;
+ }
+
public Gee.HashMap<string,GitBranch> branches; // accessed in GitBranch..
public RooTicket? activeTicket;
public bool is_master_branch()
{
// special branches that do not allow autopushing now...
- return this.currentBranch.name == "master" || this.currentBranch.name == "roojs";
+ return this.getCurrentBranch().name == "master" || this.getCurrentBranch().name == "roojs";
}
public void init_config()
continue;
}
commitrevs += commitrevs.length > 0 ? " " : "";
- commitrevs += repo.currentBranch.lastrev;
+ commitrevs += repo.getCurrentBranch().lastrev;
}
}
if (sucess && action == "CLOSE") {
if (action == "CLOSE" || action == "LEAVE") {
try {
- var oldbranch = this.currentBranch.name;
+ var oldbranch = this.getCurrentBranch().name;
this.setActiveTicket(null, master);
string [] cmd = { "merge", "--squash", oldbranch };
this.git( cmd );
string[] cmd = { "merge", master};
this.git( cmd );
var notification = new Notify.Notification(
- "Merged code from %s to %s".printf(master,this.currentBranch.name),
+ "Merged code from %s to %s".printf(master,this.getCurrentBranch().name),
"",
"dialog-information"
}
if (action == "EXIT") {
try {
- var oldbranch = this.currentBranch.name;
+ var oldbranch = this.getCurrentBranch().name;
this.setActiveTicket(null, master);
this.loadBranches();
var notification = new Notify.Notification(