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