this.init();
}
var _this = this;
- this.get('/branchView').load();
+ this.get('/branchStore').load();
this.el.show_all();
var run_ret = this.el.run();
}
},
- label : "Add",
+ label : "Pull",
pack : "add"
}
]
}
},
- id : "remotesView",
+ id : "branchView",
pack : "add",
init : function() {
XObject.prototype.init.call(this);
items : [
{
xtype: Gtk.ListStore,
- id : "remotesStore",
+ id : "branchStore",
pack : "set_model",
init : function() {
XObject.prototype.init.call(this);
//this.insert(citer,iter,0);
this.el.clear();
- var tr = Remotes.repo.remotes();
+ var tr = Branches.repo.getBranches();
for(var i =0 ; i < tr.length; i++) {
this.el.append(ret);
//print(JSON.stringify(ret,null,4));
-
+ var lastrev = tr[i].lastrev;
+ var remoterev = tr[i].remoterev;
+
+ var lastrev = lastrev.length ? lastrev : remoterev;
+
+ if (lastrev != remoterev) {
+ lastrev = "Out of sync: remote=" + remoterev + ", local=" + lastrev;
+ }
+
+
this.el.set_value(ret.iter, 0, '' + tr[i].name );
- this.el.set_value(ret.iter, 1, '' + tr[i].url );
- this.el.set_value(ret.iter, 2, '' + tr[i].type );
+ this.el.set_value(ret.iter, 1, '' + tr[i].remote );
+ this.el.set_value(ret.iter, 2, '' + lastrev );
}
min_width : 70,
pack : "append_column",
resizable : true,
- title : "Name",
+ title : "Local",
init : function() {
XObject.prototype.init.call(this);
this.el.add_attribute(this.items[0].el , 'markup', 0 );
min_width : 70,
pack : "append_column",
resizable : true,
- title : "Type",
+ title : "Remote",
init : function() {
XObject.prototype.init.call(this);
- this.el.add_attribute(this.items[0].el , 'markup', 2 );
+ this.el.add_attribute(this.items[0].el , 'markup', 1 );
},
items : [
xtype: Gtk.TreeViewColumn,
min_width : 200,
pack : "append_column",
- title : "URL",
+ title : "Status",
init : function() {
XObject.prototype.init.call(this);
- this.el.add_attribute(this.items[0].el , 'markup', 1 );
+ this.el.add_attribute(this.items[0].el , 'markup', 2 );
},
items : [