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,string>();
  71         var remotes_used  =  new Gee.HashMap<string,bool>();
  72
  73
  74                 var rem = repo.repo.lookup_remote("origin");
  75                 var cb = new GitCallbacks(repo);
  76                 rem.connect(Ggit.Direction.FETCH, cb, null, null);
  77                 var remote_heads = rem.list();
  78                 foreach(var rh in remote_heads) {
  79                         var rn = rh.get_name();
  80                         if (!rn.has_prefix("refs/heads/")) {
  81                                 continue;
  82                         }
  83                         remotes.set(rn.substring(11), rh.get_oid().to_string());
  84                         remotes_used.set(rn.substring(11), false);
  85           }
  86
  87
  88                 var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
  89                 while (r.next()) {
  90                         var br = new GitBranch(repo);
  91                         var gbr = r.get() as Ggit.Branch;
  92                         repo.branches.set(gbr.get_name(), br);
  93                         br.active = gbr.is_head();
  94                         br.name = gbr.get_name();
  95                         br.lastrev = gbr.get_target().to_string();
  96                         var rname = gbr.get_upstream() != null ? gbr.get_upstream().get_name() : "";
  97                         if (rname.has_prefix("refs/remotes/origin/")) {
  98                                 rname = rname.substring(20);
  99                                 if (remotes.has_key(rname)) {
 100                                         br.remote = rname;
 101                                         br.remoterev = remotes.get(rname);
 102                                         remotes_used.set(rname,true);
 103                                 }
 104                                 size_t ahead, behind;
 105                                 repo.get_ahead_behind(
 106                                         br.get_target(),
 107                                         rh.get_oid(),
 108                                         out ahead,
 109                                         out behind
 110                                 );
 111                                 repo.revparse(br.get_name() ).get_id();
 112
 113                                 // age?
 114                                 // behind or infront..
 115                         }
 116
 117                 }
 118
 119                 // find unused remotes.. and track them...
 120
 121
 122
 123
 124
 125       //         repo.git( { "fetch",  "-a" } ); == done async before...
 126
 127         string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
 128         var res = repo.git( cmd );
 129         var lines = res.split("\n");
 130         for (var i = 0; i < lines.length ; i++) {
 131                 var br = new GitBranch(repo);
 132                 if (!br.parseBranchListItem(lines[i])) {
 133                         continue;
 134                 }
 135                 GLib.debug("add branch %s", br.realName());
 136                 if (!br.is_remote) {
 137                         local.set(br.name, br);
 138                 } else {
 139                         remotes.set(br.remote, br);
 140                         }
 141
 142                 branches.set(br.realName(), br);
 143                 if (br.active) {
 144                         repo.currentBranch = br;
 145                 }
 146         }
 147
 148          var bl = repo.git({
 149                 "for-each-ref",
 150                 "--format",   "%(refname:short):remotes/%(upstream:short):remotes/%(authordate:relative)",
 151                 "refs/heads"
 152                 }).split("\n");
 153
 154         foreach(var line in bl) {
 155                 if (line.length < 1) continue;
 156
 157                 var ar = line.split(":remotes/");
 158                 var lname= ar[0];
 159             var rname = "remotes/" + ar[1];
 160
 161
 162                 //print(rname);
 163                 // we should always have a local version of it.
 164             if (branches.has_key(lname)) {
 165                     branches.get(lname).remote = rname;
 166                     branches.get(lname).age = ar[2];
 167             }
 168
 169             if (!branches.has_key(rname) || !branches.has_key(lname)  ) {
 170                     continue;
 171             }
 172             branches.get(lname).remoterev =  branches.get(rname).lastrev;
 173                 // flag it for not adding..
 174
 175             branches.get(rname).name = lname;
 176         }
 177         foreach(var br in branches.values) {
 178                 GLib.debug("BRANCH:\n%s\n" , br.toString());
 179                 if (br.name.length > 0 || ! /^remotes\/origin\//.match(br.remote)) {
 180                         GLib.debug("SKIP - track exists");
 181                         continue;
 182                 }
 183                 var newname = br.remote.replace("remotes/origin/","");
 184                 if (branches.has_key(newname)) {
 185                         GLib.debug("SKIP - have branch already");
 186                         continue;
 187                         }
 188
 189
 190                 repo.git(  { "branch" ,"--track" , newname,  "origin/" + newname} );
 191                 //
 192                 br.name  = newname;
 193                 local.set(br.name, br);
 194         }
 195
 196         /*
 197         this bit of the code tries to turn a local branch into a track of a remote one.
 198         -- that's probably not a good idea.
 199         var r_replace = new Regex("^remotes/");
 200         var o_replace = new Regex("^origin/");
 201         foreach(var r in remotes.values) {
 202                 if (r.name.length >0) {
 203                         return;
 204                 }
 205                 var name = r_replace.replace(r.name, r.name.length,0, "");
 206                 name = o_replace.replace(name, name.length,0, "");
 207                 name = name.replace("/", ".");
 208
 209         }
 210         */
 211         repo.branches = local;
 212
 213
 214
 215         }
 216
 217
 218         public bool parseBranchListItem(string str)
 219         {
 220                 if (str.length  < 1) {
 221                         return false;
 222                 }
 223                 this.active = str[0] == '*';
 224
 225                 var parts = Regex.split_simple ("[ \t]+", str.substring(2).strip());
 226                 if (parts[1] == "->") { // it's an alias.. eg. remotes/origin/HEAD -> origin/master..
 227                         return false;
 228                 }
 229                 this.is_remote = false;
 230                 this.lastrev = parts[1];
 231                 if (parts[0].has_prefix("remotes/")) {
 232                         this.is_remote  = true;
 233                         this.remote = parts[0];
 234                 } else {
 235                         this.name = parts[0];
 236                 }
 237             return true;
 238         }
 239         public string  realName()
 240         {
 241                 return this.is_remote ? this.remote : this.name;
 242         }
 243
 244         public void create()
 245         {
 246
 247         }
 248
 249 }
 250
 251