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                                 }
 103                                 // age?
 104                                 // behind or infront..
 105                         }
 106
 107                 }
 108
 109
 110
 111       //         repo.git( { "fetch",  "-a" } ); == done async before...
 112
 113         string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
 114         var res = repo.git( cmd );
 115         var lines = res.split("\n");
 116         for (var i = 0; i < lines.length ; i++) {
 117                 var br = new GitBranch(repo);
 118                 if (!br.parseBranchListItem(lines[i])) {
 119                         continue;
 120                 }
 121                 GLib.debug("add branch %s", br.realName());
 122                 if (!br.is_remote) {
 123                         local.set(br.name, br);
 124                 } else {
 125                         remotes.set(br.remote, br);
 126                         }
 127
 128                 branches.set(br.realName(), br);
 129                 if (br.active) {
 130                         repo.currentBranch = br;
 131                 }
 132         }
 133
 134          var bl = repo.git({
 135                 "for-each-ref",
 136                 "--format",   "%(refname:short):remotes/%(upstream:short):remotes/%(authordate:relative)",
 137                 "refs/heads"
 138                 }).split("\n");
 139
 140         foreach(var line in bl) {
 141                 if (line.length < 1) continue;
 142
 143                 var ar = line.split(":remotes/");
 144                 var lname= ar[0];
 145             var rname = "remotes/" + ar[1];
 146
 147
 148                 //print(rname);
 149                 // we should always have a local version of it.
 150             if (branches.has_key(lname)) {
 151                     branches.get(lname).remote = rname;
 152                     branches.get(lname).age = ar[2];
 153             }
 154
 155             if (!branches.has_key(rname) || !branches.has_key(lname)  ) {
 156                     continue;
 157             }
 158             branches.get(lname).remoterev =  branches.get(rname).lastrev;
 159                 // flag it for not adding..
 160
 161             branches.get(rname).name = lname;
 162         }
 163         foreach(var br in branches.values) {
 164                 GLib.debug("BRANCH:\n%s\n" , br.toString());
 165                 if (br.name.length > 0 || ! /^remotes\/origin\//.match(br.remote)) {
 166                         GLib.debug("SKIP - track exists");
 167                         continue;
 168                 }
 169                 var newname = br.remote.replace("remotes/origin/","");
 170                 if (branches.has_key(newname)) {
 171                         GLib.debug("SKIP - have branch already");
 172                         continue;
 173                         }
 174
 175
 176                 repo.git(  { "branch" ,"--track" , newname,  "origin/" + newname} );
 177                 //
 178                 br.name  = newname;
 179                 local.set(br.name, br);
 180         }
 181
 182         /*
 183         this bit of the code tries to turn a local branch into a track of a remote one.
 184         -- that's probably not a good idea.
 185         var r_replace = new Regex("^remotes/");
 186         var o_replace = new Regex("^origin/");
 187         foreach(var r in remotes.values) {
 188                 if (r.name.length >0) {
 189                         return;
 190                 }
 191                 var name = r_replace.replace(r.name, r.name.length,0, "");
 192                 name = o_replace.replace(name, name.length,0, "");
 193                 name = name.replace("/", ".");
 194
 195         }
 196         */
 197         repo.branches = local;
 198
 199
 200
 201         }
 202
 203
 204         public bool parseBranchListItem(string str)
 205         {
 206                 if (str.length  < 1) {
 207                         return false;
 208                 }
 209                 this.active = str[0] == '*';
 210
 211                 var parts = Regex.split_simple ("[ \t]+", str.substring(2).strip());
 212                 if (parts[1] == "->") { // it's an alias.. eg. remotes/origin/HEAD -> origin/master..
 213                         return false;
 214                 }
 215                 this.is_remote = false;
 216                 this.lastrev = parts[1];
 217                 if (parts[0].has_prefix("remotes/")) {
 218                         this.is_remote  = true;
 219                         this.remote = parts[0];
 220                 } else {
 221                         this.name = parts[0];
 222                 }
 223             return true;
 224         }
 225         public string  realName()
 226         {
 227                 return this.is_remote ? this.remote : this.name;
 228         }
 229
 230         public void create()
 231         {
 232
 233         }
 234
 235 }
 236
 237