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 = "";
  35         public bool is_remote;
  36         public string remote = "";
  37         public string remoterev = "";
  38         public string age = "";
  39
  40
  41
  42         public string toString()
  43         {
  44                 return
  45                         "active: " + (active ? "true" : "false") + "\n" +
  46                         "is_remote: " + (is_remote ? "true" : "false") + "\n" +
  47                         "lastrev: " + lastrev + "\n" +
  48                         "name: " + name + "\n" +
  49                         "remote: " + remote + "\n" +
  50                         "remoterev: " + remoterev + "\n" +
  51                         "age: " + age + "\n" ;
  52         }
  53
  54
  55         public GitBranch(GitRepo repo)
  56         {
  57                 this.repo = repo;
  58         }
  59
  60
  61
  62
  63         public static  void loadBranches(GitRepo repo)
  64         {
  65                 repo.branches = new Gee.HashMap<string,GitBranch>();
  66
  67         var branches =  new Gee.HashMap<string,GitBranch>();
  68         var local =  new Gee.HashMap<string,GitBranch>();
  69         var remotes  =  new Gee.HashMap<string,GitBranch>();
  70
  71
  72                 repo.loadRemoteHeads();
  73
  74
  75                 var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
  76                 while (r.next()) {
  77                         var br = r.get() as Ggit.Branch;
  78
  79                         this.branches.add(br);
  80                         if (br.is_head()) {
  81                                 GLib.debug("HEAD= %s", br.get_name());
  82                                 this.head = br;
  83                         }
  84
  85                 }
  86
  87
  88
  89       //         repo.git( { "fetch",  "-a" } ); == done async before...
  90
  91         string[] cmd = { "branch",   "--no-color", "--verbose", "--no-abbrev" , "-a"  };
  92         var res = repo.git( cmd );
  93         var lines = res.split("\n");
  94         for (var i = 0; i < lines.length ; i++) {
  95                 var br = new GitBranch(repo);
  96                 if (!br.parseBranchListItem(lines[i])) {
  97                         continue;
  98                 }
  99                 GLib.debug("add branch %s", br.realName());
 100                 if (!br.is_remote) {
 101                         local.set(br.name, br);
 102                 } else {
 103                         remotes.set(br.remote, br);
 104                         }
 105
 106                 branches.set(br.realName(), br);
 107                 if (br.active) {
 108                         repo.currentBranch = br;
 109                 }
 110         }
 111
 112          var bl = repo.git({
 113                 "for-each-ref",
 114                 "--format",   "%(refname:short):remotes/%(upstream:short):remotes/%(authordate:relative)",
 115                 "refs/heads"
 116                 }).split("\n");
 117
 118         foreach(var line in bl) {
 119                 if (line.length < 1) continue;
 120
 121                 var ar = line.split(":remotes/");
 122                 var lname= ar[0];
 123             var rname = "remotes/" + ar[1];
 124
 125
 126                 //print(rname);
 127                 // we should always have a local version of it.
 128             if (branches.has_key(lname)) {
 129                     branches.get(lname).remote = rname;
 130                     branches.get(lname).age = ar[2];
 131             }
 132
 133             if (!branches.has_key(rname) || !branches.has_key(lname)  ) {
 134                     continue;
 135             }
 136             branches.get(lname).remoterev =  branches.get(rname).lastrev;
 137                 // flag it for not adding..
 138
 139             branches.get(rname).name = lname;
 140         }
 141         foreach(var br in branches.values) {
 142                 GLib.debug("BRANCH:\n%s\n" , br.toString());
 143                 if (br.name.length > 0 || ! /^remotes\/origin\//.match(br.remote)) {
 144                         GLib.debug("SKIP - track exists");
 145                         continue;
 146                 }
 147                 var newname = br.remote.replace("remotes/origin/","");
 148                 if (branches.has_key(newname)) {
 149                         GLib.debug("SKIP - have branch already");
 150                         continue;
 151                         }
 152
 153
 154                 repo.git(  { "branch" ,"--track" , newname,  "origin/" + newname} );
 155                 //
 156                 br.name  = newname;
 157                 local.set(br.name, br);
 158         }
 159
 160         /*
 161         this bit of the code tries to turn a local branch into a track of a remote one.
 162         -- that's probably not a good idea.
 163         var r_replace = new Regex("^remotes/");
 164         var o_replace = new Regex("^origin/");
 165         foreach(var r in remotes.values) {
 166                 if (r.name.length >0) {
 167                         return;
 168                 }
 169                 var name = r_replace.replace(r.name, r.name.length,0, "");
 170                 name = o_replace.replace(name, name.length,0, "");
 171                 name = name.replace("/", ".");
 172
 173         }
 174         */
 175         repo.branches = local;
 176
 177
 178
 179         }
 180
 181
 182         public bool parseBranchListItem(string str)
 183         {
 184                 if (str.length  < 1) {
 185                         return false;
 186                 }
 187                 this.active = str[0] == '*';
 188
 189                 var parts = Regex.split_simple ("[ \t]+", str.substring(2).strip());
 190                 if (parts[1] == "->") { // it's an alias.. eg. remotes/origin/HEAD -> origin/master..
 191                         return false;
 192                 }
 193                 this.is_remote = false;
 194                 this.lastrev = parts[1];
 195                 if (parts[0].has_prefix("remotes/")) {
 196                         this.is_remote  = true;
 197                         this.remote = parts[0];
 198                 } else {
 199                         this.name = parts[0];
 200                 }
 201             return true;
 202         }
 203         public string  realName()
 204         {
 205                 return this.is_remote ? this.remote : this.name;
 206         }
 207
 208         public void create()
 209         {
 210
 211         }
 212
 213 }
 214
 215