public bool active = false;
public string lastrev = "";
- public string name = "";
+ public string name = ""; // human friendly name...
public bool is_remote;
public string remote = "";
public string remoterev = "";
public string age = "";
+ public int ahead = 0;
+ public int behind = 0;
+
+
public string toString()
{
{
this.repo = repo;
}
+
+ public Ggit.Tree getTree()
+ {
+ var br = this.repo.repo.lookup_branch(this.name,Ggit.BranchType.LOCAL);
+ return this.repo.repo.lookup_commit(br.get_target()).get_tree();
+ }
+
public static void loadBranches(GitRepo repo)
{
repo.branches = new Gee.HashMap<string,GitBranch>();
- var branches = new Gee.HashMap<string,GitBranch>();
- var local = new Gee.HashMap<string,GitBranch>();
- var remotes = new Gee.HashMap<string,GitBranch>();
-
+ //var branches = new Gee.HashMap<string,GitBranch>();
+ //var local = new Gee.HashMap<string,GitBranch>();
+ var remotes = new Gee.HashMap<string,Ggit.OId>();
+ var remotes_used = new Gee.HashMap<string,bool>();
+
+
+
+ var rem = repo.repo.lookup_remote("origin");
+ var cb = new GitCallbacks(repo);
+ rem.connect(Ggit.Direction.FETCH, cb, null, null);
+ var remote_heads = rem.list();
+ foreach(var rh in remote_heads) {
+ var rn = rh.get_name();
+ if (!rn.has_prefix("refs/heads/")) {
+ continue;
+ }
+ remotes.set(rn.substring(11), rh.get_oid());
+ remotes_used.set(rn.substring(11), false);
+
+ }
+
+
+ var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
+ while (r.next()) {
+
+
+
+ var br = new GitBranch(repo);
+ var gbr = r.get() as Ggit.Branch;
+ if (!gbr.is_branch()) {
+ continue;
+ }
+
+ br.active = gbr.is_head();
+ br.name = gbr.get_name();
+ br.lastrev = gbr.get_target().to_string();
+ string rname ;
+ try {
+ rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
+ } catch(Error e) {
+ GLib.debug("Skip branch = got error");
+ continue;
+ }
+ repo.branches.set(gbr.get_name(), br);
+ if (rname.has_prefix("refs/remotes/origin/")) {
+ rname = rname.substring(20);
+ if (remotes.has_key(rname)) {
+ br.remote = rname;
+ br.remoterev = remotes.get(rname).to_string();
+ remotes_used.set(rname,true);
+ size_t ahead, behind;
+ br.behind = 1;
+
+ try {
+ repo.repo.get_ahead_behind(
+ gbr.get_target(),
+ remotes.get(rname),
+ out ahead,
+ out behind
+ );
+ br.ahead = (int)ahead;
+ br.behind = (int) behind;
+
+ } catch(Error e) {
+ GLib.debug("we probably need to fetch... %s", repo.name);
+ }
+
+ }
+
+
+ // age?
+ // behind or infront..
+ }
+ if (br.active) {
+ GLib.debug("repo: %s currentBranch = %s", repo.name, br.name);
+ repo._currentBranch = br;
+ }
+
+ }
+
+ // find unused remotes.. and track them...
+ foreach(var rn in remotes_used.keys) {
+ if (remotes_used.get(rn)) {
+ continue;
+ }
+ if (repo.branches.has_key(rn)) {
+ GLib.debug("skip tracking branch - same name exists?");
+ continue;
+ }
+ // not clear how to do this yet...
+ try {
+ repo.git( { "branch" ,"--track" , rn, "origin/" + rn} );
+ } catch (Error e) {
+ continue; // allow failure?
+ }
+ var br = new GitBranch(repo);
+ br.name = rn;
+ br.lastrev = ""; // it's behind
+ br.remoterev = remotes.get(rn).to_string();
+ br.remote = rn;
+ br.ahead = 0;
+ br.behind = 1;
+ // behind/ahead == 0...
+ repo.branches.set(rn, br);
+
+ }
+
+ if (repo._currentBranch == null) {
+ GLib.error("could not find active Branch for %s", repo.name);
+ }
+
+
+
+ /*
// repo.git( { "fetch", "-a" } ); == done async before...
string[] cmd = { "branch", "--no-color", "--verbose", "--no-abbrev" , "-a" };
br.name = newname;
local.set(br.name, br);
}
-
+ */
/*
this bit of the code tries to turn a local branch into a track of a remote one.
-- that's probably not a good idea.
name = name.replace("/", ".");
}
- */
+
repo.branches = local;
-
+ */
}
return this.is_remote ? this.remote : this.name;
}
- public void create()
- {
-
- }
+// public void create() { }
}
projects / gitlive / blobdiff