git.roojs.org Git - gitlive/blob - GitBranch.vala

   1 /**
   2 represent a git branch..
   3 Branching / Gitlive:
   4
   5 Does repo require branching? - flag in config?
   6 ** list of repo's ?? with ability to turn on/off
   7
   8 Start editing without branch?
   9 -> show prompt to start branch
  10 -> flag a ticket? optional ??
  11
  12 Once editing branch...
  13 -> merge with squash / ticket...
  14 ** show list of repo's with 'working' branches?
  15 ** select some/all to merge with a issue fix..
  16
  17 ?? closing ticket in system ??
  18 -> done by the ui?
  19
  20 need to push all? / fetch all?
  21
  22
  23 list of repo's
  24
  25
  26 */
  27
  28 public class GitBranch : Object
  29 {
  30         public GitRepo repo;
  31
  32         public bool active = false;
  33         public string lastrev = "";
  34         public string name = ""; // human friendly name...
  35         public bool is_remote;
  36         public string remote = "";
  37         public string remoterev = "";
  38         public string age = "";
  39
  40
  41
  42
  43         public string toString()
  44         {
  45                 return
  46                         "active: " + (active ? "true" : "false") + "\n" +
  47                         "is_remote: " + (is_remote ? "true" : "false") + "\n" +
  48                         "lastrev: " + lastrev + "\n" +
  49                         "name: " + name + "\n" +
  50                         "remote: " + remote + "\n" +
  51                         "remoterev: " + remoterev + "\n" +
  52                         "age: " + age + "\n" ;
  53         }
  54
  55
  56         public GitBranch(GitRepo repo)
  57         {
  58                 this.repo = repo;
  59         }
  60
  61
  62
  63
  64         public static  void loadBranches(GitRepo repo)
  65         {
  66                 repo.branches = new Gee.HashMap<string,GitBranch>();
  67
  68         //var branches =  new Gee.HashMap<string,GitBranch>();
  69         //var local =  new Gee.HashMap<string,GitBranch>();
  70         var remotes  =  new Gee.HashMap<string,Ggit.OId>();
  71         var remotes_used  =  new Gee.HashMap<string,bool>();
  72
  73
  74
  75                 var rem = repo.repo.lookup_remote("origin");
  76                 var cb = new GitCallbacks(repo);
  77                 rem.connect(Ggit.Direction.FETCH, cb, null, null);
  78                 var remote_heads = rem.list();
  79                 foreach(var rh in remote_heads) {
  80                         var rn = rh.get_name();
  81                         if (!rn.has_prefix("refs/heads/")) {
  82                                 continue;
  83                         }
  84                         remotes.set(rn.substring(11), rh.get_oid());
  85                         remotes_used.set(rn.substring(11), false);
  86
  87           }
  88
  89
  90                 var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
  91                 while (r.next()) {
  92                         var br = new GitBranch(repo);
  93                         var gbr = r.get() as Ggit.Branch;
  94                         repo.branches.set(gbr.get_name(), br);
  95                         br.active = gbr.is_head();
  96                         br.name = gbr.get_name();
  97                         br.lastrev = gbr.get_target().to_string();
  98                         var rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
  99                         if (rname.has_prefix("refs/remotes/origin/")) {
 100                                 rname = rname.substring(20);
 101                                 if (remotes.has_key(rname)) {
 102                                         br.remote = rname;
 103                                         br.remoterev = remotes.get(rname).to_string();
 104                                         remotes_used.set(rname,true);
 105                                         size_t ahead, behind;
 106                                         repo.repo.get_ahead_behind(
 107                                                 gbr.get_target(),
 108                                                 remotes.get(rname),
 109                                                 out ahead,
 110                                                 out behind
 111                                         );
 112
 113                                 }
 114                                 repo.revparse(br.get_name() ).get_id();
 115
 116                                 // age?
 117                                 // behind or infront..
 118                         }
 119
 120                 }
 121
 122                 // find unused remotes.. and track them...
 123
 124
 125
 126
 127
 128       //         repo.git( { "fetch",  "-a" } ); == done async before...
 129
 130         string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
 131         var res = repo.git( cmd );
 132         var lines = res.split("\n");
 133         for (var i = 0; i < lines.length ; i++) {
 134                 var br = new GitBranch(repo);
 135                 if (!br.parseBranchListItem(lines[i])) {
 136                         continue;
 137                 }
 138                 GLib.debug("add branch %s", br.realName());
 139                 if (!br.is_remote) {
 140                         local.set(br.name, br);
 141                 } else {
 142                         remotes.set(br.remote, br);
 143                         }
 144
 145                 branches.set(br.realName(), br);
 146                 if (br.active) {
 147                         repo.currentBranch = br;
 148                 }
 149         }
 150
 151          var bl = repo.git({
 152                 "for-each-ref",
 153                 "--format",   "%(refname:short):remotes/%(upstream:short):remotes/%(authordate:relative)",
 154                 "refs/heads"
 155                 }).split("\n");
 156
 157         foreach(var line in bl) {
 158                 if (line.length < 1) continue;
 159
 160                 var ar = line.split(":remotes/");
 161                 var lname= ar[0];
 162             var rname = "remotes/" + ar[1];
 163
 164
 165                 //print(rname);
 166                 // we should always have a local version of it.
 167             if (branches.has_key(lname)) {
 168                     branches.get(lname).remote = rname;
 169                     branches.get(lname).age = ar[2];
 170             }
 171
 172             if (!branches.has_key(rname) || !branches.has_key(lname)  ) {
 173                     continue;
 174             }
 175             branches.get(lname).remoterev =  branches.get(rname).lastrev;
 176                 // flag it for not adding..
 177
 178             branches.get(rname).name = lname;
 179         }
 180         foreach(var br in branches.values) {
 181                 GLib.debug("BRANCH:\n%s\n" , br.toString());
 182                 if (br.name.length > 0 || ! /^remotes\/origin\//.match(br.remote)) {
 183                         GLib.debug("SKIP - track exists");
 184                         continue;
 185                 }
 186                 var newname = br.remote.replace("remotes/origin/","");
 187                 if (branches.has_key(newname)) {
 188                         GLib.debug("SKIP - have branch already");
 189                         continue;
 190                         }
 191
 192
 193                 repo.git(  { "branch" ,"--track" , newname,  "origin/" + newname} );
 194                 //
 195                 br.name  = newname;
 196                 local.set(br.name, br);
 197         }
 198
 199         /*
 200         this bit of the code tries to turn a local branch into a track of a remote one.
 201         -- that's probably not a good idea.
 202         var r_replace = new Regex("^remotes/");
 203         var o_replace = new Regex("^origin/");
 204         foreach(var r in remotes.values) {
 205                 if (r.name.length >0) {
 206                         return;
 207                 }
 208                 var name = r_replace.replace(r.name, r.name.length,0, "");
 209                 name = o_replace.replace(name, name.length,0, "");
 210                 name = name.replace("/", ".");
 211
 212         }
 213         */
 214         repo.branches = local;
 215
 216
 217
 218         }
 219
 220
 221         public bool parseBranchListItem(string str)
 222         {
 223                 if (str.length  < 1) {
 224                         return false;
 225                 }
 226                 this.active = str[0] == '*';
 227
 228                 var parts = Regex.split_simple ("[ \t]+", str.substring(2).strip());
 229                 if (parts[1] == "->") { // it's an alias.. eg. remotes/origin/HEAD -> origin/master..
 230                         return false;
 231                 }
 232                 this.is_remote = false;
 233                 this.lastrev = parts[1];
 234                 if (parts[0].has_prefix("remotes/")) {
 235                         this.is_remote  = true;
 236                         this.remote = parts[0];
 237                 } else {
 238                         this.name = parts[0];
 239                 }
 240             return true;
 241         }
 242         public string  realName()
 243         {
 244                 return this.is_remote ? this.remote : this.name;
 245         }
 246
 247         public void create()
 248         {
 249
 250         }
 251
 252 }
 253
 254