NewBranch.bjs
[gitlive] / Git.vala
1
2 // valac -o /tmp/ggit Git.vala --pkg libgit2-glib-1.0 --pkg libsoup-2.4 --pkg gee-0.8 -g
3  
4
5 void main()
6 {
7          GLib.Log.set_handler(null, 
8             GLib.LogLevelFlags.LEVEL_DEBUG | GLib.LogLevelFlags.LEVEL_WARNING | GLib.LogLevelFlags.LEVEL_INFO, 
9             (dom, lvl, msg) => {
10                                         
11                                         
12                // should we debug..
13                                         
14                         
15                print("%s\n", msg);
16             }
17          ); 
18
19         
20         Ggit.init();
21         var a = new GitLive.Repo("/home/alan/gitlive/web.Texon");
22         a.fetchAll();
23         return;
24         /*
25         GLib.Timeout.add (1, () => {
26       GLib.debug("Meanwhile");
27       return true;
28     }, GLib.Priority.HIGH);
29         
30         var loop = new MainLoop();
31          
32         var a = new GitLive.Repo("/home/alan/gitlive/web.coba");
33       GLib.debug("Starting");   
34         a.loadRemoteHeads.begin(true, (obj,res) => {
35                 a.loadRemoteHeads.end(res);
36                  GLib.debug("got results");
37                 a.loadLocalBranches();
38                 loop.quit();
39         });
40         loop.run();
41         //a.mergeMasterIntoHead();
42         //a.walkDiff();
43         //return;
44         //a.is_managed();
45         //a.is_autocommit();
46         
47
48         //a.fetchAll();
49         //
50         /*
51         var a = new GitLive.Repo("/home/alan/git/test1-clone");
52         //a.fetchAll();
53         var str = (new GLib.DateTime.now_utc()).format("%Y-%m-%d %H:%M:%S");
54         GLib.FileUtils.set_contents("/home/alan/git/test1-clone/test1",  str); 
55         
56         var ix = a.repo.get_index();
57         ix.add_path("test1");
58         ix.write();
59         var treeoid = ix.write_tree();
60
61         var head = a.repo.get_head();
62         var parent = head.lookup() as Ggit.Commit;
63         Ggit.Commit[] parents = (parent == null) ? 
64                 new Ggit.Commit[] {} :
65                 new Ggit.Commit[] { parent };
66
67         var tree = a.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;// odd format.. 
68         
69         var sig = new Ggit.Signature.now("Alan Knowles", "alan@roojs.com");
70         a.repo.create_commit("HEAD", sig, sig, null, "test commit " + str, tree, parents);
71         */
72         // mmh.. no git add/commit in library...
73 //      string[] spawn_args = {"git", "commit", "-m", "test", "-a"};
74         //string[] spawn_env = Environ.get ();
75 //      Process.spawn_sync ("/home/alan/git/test1-clone", spawn_args, spawn_env, SpawnFlags.SEARCH_PATH, null);
76  
77         //a.pushAll();
78 }
79  
80
81 namespace  GitLive {
82
83         public class Repo : Object {
84
85                 string name = "";
86                 public Ggit.Repository  repo;
87                 Callbacks callbacks;
88
89                 public Repo(string path)
90                 {
91                         this.name = GLib.Path.get_basename(path);
92                         this.repo = Ggit.Repository.open(GLib.File.new_for_path(path));
93                         this.callbacks = new Callbacks(this);
94                 
95                 }
96                 Ggit.Branch                                             head = null;
97             Gee.ArrayList<Ggit.Branch>          branches = null;
98             Ggit.RemoteHead[]                           remote_heads = null;
99                 public void loadLocalBranches(bool force = false)
100                 {
101                         if (!force && this.branches != null) {
102                                 return;
103                         }
104                         
105                         this.branches =  new Gee.ArrayList<Ggit.Branch>();
106                         var r = this.repo.enumerate_branches(Ggit.BranchType.LOCAL);
107                         while (r.next()) {
108                                 var br = r.get() as Ggit.Branch;
109                                 if (br == null) {
110                                         continue;
111                                 }
112                                 if (br.is_tag()) {
113                                         continue;
114                                 }
115                                 
116                                 //var head = this.repo.revparse("refs/heads/" + br.get_name() ).get_id();
117                                 //var rhead = this.repo.revparse(br.get_upstream().get_name() ).get_id();
118                                 try {
119                                         GLib.debug("got branch: N=%s", br.get_name() );
120                                         GLib.debug("is_head %s", br.is_head() ? "Y" : "n");
121
122                                         GLib.debug("upstream = %s", br.get_upstream() == null ? "??" : br.get_upstream().get_name().substring(20));
123                                         GLib.debug("oid = %s",br.get_target().to_string());
124                                         this.branches.add(br);
125                                         if (br.is_head()) {
126                                                 GLib.debug("HEAD= %s", br.get_name());
127                                                 this.head = br;
128                                         }
129                                 } catch (Error e) {
130                                         GLib.debug("Skip branch");
131                                 }
132                         }
133                         
134                         
135                 }
136                  
137                 public bool is_managed()
138                 {
139                         GLib.debug("is_managed: %d", this.repo.get_config().get_int32("gitlive.managed"));
140                         return this.repo.get_config().get_int32("gitlive.managed") == 1;
141                 }
142                 
143                 
144                 public bool is_autocommit ()
145                 {       
146                         GLib.debug("is_autocommit: %d", this.repo.get_config().get_int32("gitlive.autocommit"));
147                         return this.repo.get_config().get_int32("gitlive.autocommit") == 1;
148                 }
149                 public void set_autocommit(bool val)
150                 {
151                         this.repo.get_config().set_int32("gitlive.autocommit", val ? 1 : 0);
152                 
153                 }
154                  
155                 public void walkDiff()
156                 {
157                         this.loadLocalBranches();
158                         
159                         
160                         
161                         var oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
162                         var moid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
163                         
164                         var a = new Ggit.RevisionWalker(this.repo);
165                         a.set_sort_mode(Ggit.SortMode.TOPOLOGICAL);
166                         a.push(oid);
167                         a.hide(moid);
168                         var last = oid;
169                         for (var noid = a.next(); noid != null; noid= a.next()) {
170                                 //var commit = this.repo.lookup(noid, typeof(Ggit.Commit)) as Ggit.Commit;
171                                 GLib.debug("rev: %s",
172                                         noid.to_string()
173                                 );
174                                 last = noid;
175                         }
176                         var commit = this.repo.lookup(last, typeof(Ggit.Commit)) as Ggit.Commit;
177                         var parent = commit.get_parents();
178                         GLib.debug("parent = %s", parent.get_id(0).to_string());
179                         var master_rev =  parent.get_id(0);
180                         var master_commit  = this.repo.lookup_commit(master_rev);;
181                         
182                         var head_commit = this.repo.lookup_commit(oid);
183                         
184                         var master_tree = master_commit.get_tree();
185                         var head_tree = head_commit.get_tree();
186                         
187                         var diff = new Ggit.Diff.tree_to_tree(this.repo, master_tree, head_tree, new Ggit.DiffOptions());
188                         
189                         diff.print(Ggit.DiffFormatType.PATCH, ( delta,  hunk,  line) => {
190                                 GLib.debug("%d: %s, %s", line.get_new_lineno(), line.get_origin().to_string(), line.get_text());
191                                 return 0;
192                         });
193                         // let's try a merge..
194                         var mo = new Ggit.MergeOptions();
195                         mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
196                         var ix = this.repo.merge_trees(master_tree, master_tree, head_tree, mo);
197                         
198                         if (ix.has_conflicts()) {
199                                 GLib.debug("merge has conflicts");
200                                 return;
201                         }
202                          var treeoid = ix.write_tree();
203                          
204                          
205                           
206                         var parents =   new Ggit.Commit[] { master_commit };
207
208
209                         var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
210                         
211                         var sig = new Ggit.Signature.now(
212                                         this.repo.get_config().get_string("user.name"),
213                                         this.repo.get_config().get_string("user.email")
214                         );
215                         
216                         
217                         
218                         this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
219          
220                         
221                         
222                 }
223                 public void mergeMasterIntoHead()
224                 {
225                         // assumes head is not master...
226                         this.loadLocalBranches();
227                         GLib.debug("head rev = %s", this.head.get_name());
228                         var head_oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
229                         //var master_oid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
230                         var master_oid =  this.repo.revparse("HEAD" ).get_id()  ;
231
232                         var master_commit  = this.repo.lookup_commit(master_oid);;
233                         var head_commit = this.repo.lookup_commit(head_oid);
234                          
235                 
236                         var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
237                         
238                         var anc_commit = this.repo.lookup_commit(anc_oid);
239                         var anc_tree = anc_commit.get_tree();
240                         
241                         var mo = new Ggit.MergeOptions();
242                         var co = new Ggit.CheckoutOptions();
243                         var the_ref = this.repo.lookup_reference_dwim("refs/heads/master");
244
245                     var ac = new Ggit.AnnotatedCommit.from_ref(this.repo, the_ref);
246                         
247                         var commits =   new Ggit.AnnotatedCommit[] { ac };
248                         
249                         this.repo.merge(commits, mo, co);
250                         
251                         var cfg = this.repo.get_config().snapshot();
252                         
253                     var sig = new Ggit.Signature.now(
254                                         cfg.get_string("user.name"),
255                                         cfg.get_string("user.email")
256                         );
257                         var new_head = this.repo.get_head();
258                         var oid = new_head.get_target();
259
260                         var ix = this.repo.get_index();
261  
262                         ix.write();
263                         var treeoid = ix.write_tree();
264
265                         var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
266                         
267                         var parent = new_head.lookup() as Ggit.Commit;
268                         Ggit.Commit[] parents =  new Ggit.Commit[] { parent };
269                         
270                         this.repo.create_commit("refs/heads/" + this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
271          
272                 }
273                 
274                 
275                 /*
276                 public bool doMergeClose(string commit_message)
277                 {
278                         this.loadLocalBranches(true);
279                         var oldbranch = this.head.get_name();
280             // going to asume this is merge trees..
281                            string [] cmd = { "merge",   "--squash",  oldbranch };
282                            this.git( cmd );
283                            cmd = { "commit",   "-a" , "-m",  commit_message };
284                            this.git( cmd );
285                            this.push();
286                            this.loadBranches(); // updates lastrev..
287                
288                        var notification = new Notify.Notification(
289                                "Merged branch %s to %s".printf(oldbranch, master),
290                                "",
291                                 "dialog-information"
292                                
293                        );
294
295                        notification.set_timeout(5);
296                        notification.show();   
297                
298                 
299                 }
300                 */
301                 
302                 
303                 public bool is_auto_branch ()
304                 {
305                         if (this.name == "gitlog") {
306                                 return false;
307                         }
308                         // check remote...
309                         if (this.is_managed()) {
310                                 return true;
311                         }
312                         return false;
313                         
314          
315                 }
316                 
317                 public async void loadRemoteHeads(bool force = false)
318                 {
319                     SourceFunc callback = loadRemoteHeads.callback;
320                         
321                         ThreadFunc<bool> run = () => {
322                                 
323                                 if (!force && this.remote_heads != null) {
324                                         return true;;
325                                 }
326                                 var r = this.repo.lookup_remote("origin");
327                                 r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
328                                 yield;
329                                 this.remote_heads = r.list();
330                                 
331                                 foreach(var br in this.remote_heads) {
332                                         if (!br.get_name().has_prefix("refs/heads/")) {
333                                                 continue;
334                                         }
335                                         
336                                         GLib.debug("Remote: name=%s  oid=%s local_oid=%s is_local=%s",
337                                                 br.get_name(),
338                                                 br.get_oid().to_string(),
339                                                 br.get_local_oid().to_string(),
340                                                 br.is_local() ? "Y" : "n"
341                                                 );
342                                 }
343                                 Idle.add((owned) callback);
344                                 return true;;
345                         };
346                         new Thread<bool>("loadRemoteHeads-" , run);
347                         yield;
348                         
349
350                 }
351                  
352                 
353                 Ggit.Branch? getBranch(string remote_name, string remote_branch_name)
354                 {
355                          //GLib.debug("bn=%s",remote_branch_name);
356                          if (remote_branch_name.has_prefix("refs/remotes/")) {
357                                  return null;
358                          }
359
360                          var target = remote_branch_name.replace("refs/heads/", remote_name+"/") .replace("refs/remotes/", "");
361                         if (target == "HEAD") {
362                                 target = remote_name +"/master";
363                         }
364                          
365                         foreach(var br in this.branches) {
366                         //      GLib.debug("test:%s=%s", br.get_upstream().get_shorthand() , target);
367                                 if ( br.get_upstream().get_shorthand() == target) {
368                                         return br;
369                                 }
370                                 
371                         }
372                         //GLib.debug("missing %s", remote_branch_name);                 
373                         return null;
374                 
375                 }
376                  
377                 
378                 public void fetchAll()
379                 {
380                         this.loadLocalBranches();
381                         this.loadRemoteHeads();
382                         
383                         // remotes probably will not work with http auth..
384                         //var ar = this.repo.list_remotes();
385                         //foreach(var n in ar) {
386                         var n = "origin"; 
387                         
388                                 GLib.debug("got remote '%s'", n);
389                                 var r = this.repo.lookup_remote(n);
390                                 GLib.debug("connecting '%s'", r.get_url());
391                                  
392                                 try {
393                                         string[] h = { "a = 1" };
394                                         r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
395                                         
396                                 } catch (Error e) {
397                                         GLib.debug("Got Error Message: %s", e.message);
398                                         return;
399                                 }
400                                 string[] far = {};
401
402                                 foreach(var rh in this.remote_heads) {
403                                         if (rh.get_name().has_prefix("refs/remotes/")) {
404                                                    continue;
405                                          }
406                                 
407                                         var br = this.getBranch(n, rh.get_name());
408                                  
409                                         /*GLib.debug("got heads: name=%s   rev=%s  localrev=%s",
410                                                 rh.get_name(), 
411                                                 rh.get_oid().to_string(),
412                                                 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
413                                         );
414                                         */
415                                         //var loc_oid = this.repo.revparse(br.get_name() ).get_id();
416                                         
417                                         var loc_oid = br.get_target();
418                                         
419                                         size_t ahead, behind;
420                                         this.repo.get_ahead_behind(
421                                                 loc_oid,
422                                                 rh.get_oid(),
423                                                 out ahead,
424                                                 out behind
425                                         );
426                                         
427                                         if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
428                                                 continue;
429                                         }
430                                         if (ahead > 0) {
431                                                 continue;
432                                         }
433                                         far += ("+refs/heads/" + br.get_name()) + ":refs/remotes/" + n + "/" + rh.get_name().replace("refs/heads/","");
434                                 } 
435                                 
436                                 if (far.length < 1) {
437                                         GLib.debug("no fetch required.. it's uptodate");
438                                         r.disconnect();
439                                         return;
440                                 }
441                                 
442                                 GLib.debug("getting remote specs '%s', %d", n, far.length);
443                                 
444 /*
445                                 var far = r.get_fetch_specs();
446                                 */
447                                 foreach(var rs in far) {
448                                         GLib.debug("got remote spec: %s", rs);
449                                         
450                                 }
451
452                                 var options = new Ggit.FetchOptions();
453                                 options.set_remote_callbacks(this.callbacks);
454                                 //yield Async.thread(() => {
455         
456                                         r.download(far, options);
457                                 //});
458                                 r.disconnect();
459                                 
460                                 //r.download(
461                          
462                 
463                 }
464                 
465                 
466                 
467                 public void pushAll()
468                 {
469                         
470                         this.loadLocalBranches();
471                         this.loadRemoteHeads();
472                         // remotes probably will not work with http auth..
473                         //var ar = this.repo.list_remotes();
474                         var n = "origin";
475                         
476                                 GLib.debug("got remote '%s'", n);
477                                 var r = this.repo.lookup_remote(n);
478                                 GLib.debug("connecting '%s'", r.get_url());
479                                  
480                                 r.connect(Ggit.Direction.PUSH, this.callbacks, null, null);
481                                 
482                                 //GLib.debug("getting specs '%s'", n);
483                                 /* 
484                                 
485                                 this.repo.add_remote_push(
486                                         "origin",
487                                         "+%s:%s".printf(head.get_shorthand(),head.get_name())
488                                 );
489  */
490  
491                                 string[] far = {};
492                                 var heads = r.list();
493                                 foreach(var rh in heads) {
494                                         if (rh.get_name().has_prefix("refs/remotes/")) {
495                                                    continue;
496                                          }
497                                 
498                                         var br = this.getBranch(n, rh.get_name());
499                                         /*
500                                         GLib.debug("got heads: name=%s   rev=%s  localrev=%s",
501                                                 rh.get_name(), 
502                                                 rh.get_oid().to_string(),
503                                                 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
504                                         );*/
505                                         var loc_oid = this.repo.revparse(br.get_name() ).get_id();
506                                         size_t ahead, behind;
507                                         this.repo.get_ahead_behind(
508                                                 loc_oid,
509                                                 rh.get_oid(),
510                                                 out ahead,
511                                                 out behind
512                                         );
513                                         
514                                         if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
515                                                 continue;
516                                         }
517                                         if (behind > 0) {
518                                                 continue;
519                                         }
520                                         far += ("+refs/heads/" + br.get_name()) + ":"+ rh.get_name();
521                                 }  
522                                 
523                                 if (far.length < 1) {
524                                         GLib.debug("no push required.. it's uptodate");
525                                         r.disconnect();
526                                         return;
527                                 }
528  
529                                 /*var head = this.repo.get_head();
530                                 string[] far = {};
531                                 far += "+%s:%s".printf(head.get_name(),head.get_name());
532                                 */
533                                 foreach(var rs in far) {
534                                         GLib.debug("got remote spec: %s", rs);
535                                         
536                                 }
537                                         
538                                 var popts = new Ggit.PushOptions();
539                                  popts.callbacks = this.callbacks;
540                                 GLib.debug("Push?");
541                                 r.upload(far,popts);
542                                 GLib.debug("Push done?");
543                                 r.disconnect();
544                                 
545                                 
546                                 //r.download(
547                          
548                 
549                 }
550                 
551                  
552
553         }
554         
555         private class Callbacks : Ggit.RemoteCallbacks
556         {
557                 //private Remote d_remote;
558                 private Ggit.RemoteCallbacks? d_proxy = null;
559
560                 public delegate void TransferProgress(Ggit.TransferProgress stats);
561                 //private TransferProgress? d_transfer_progress;
562
563                 public Callbacks( Repo repo)  //, Ggit.RemoteCallbacks? proxy) //,Remote remote, owned TransferProgress? transfer_progress)
564                 {
565                         //d_remote = remote;
566                         //d_proxy = proxy;
567                         //d_transfer_progress = (owned)transfer_progress;
568                 }
569
570                 protected override void progress(string message)
571                 {
572                         GLib.debug("progress: %s", message);
573                         if (d_proxy != null)
574                         {
575                                 d_proxy.progress(message);
576                         }
577                 }
578
579                 protected override void transfer_progress(Ggit.TransferProgress stats)
580                 {
581                         GLib.debug("transfer_progress");
582                         /*
583                         if (d_transfer_progress != null)
584                         {
585                                 d_transfer_progress(stats);
586                         }
587
588                         if (d_proxy != null)
589                         {
590                                 d_proxy.transfer_progress(stats);
591                         }
592                         */
593                 }
594
595                 protected override void update_tips(string refname, Ggit.OId a, Ggit.OId b)
596                 {
597                         GLib.debug("update_tips");
598                         //d_remote.tip_updated(refname, a, b);
599
600                         if (d_proxy != null)
601                         {
602                                 d_proxy.update_tips(refname, a, b);
603                         }
604                 }
605
606                 protected override void completion(Ggit.RemoteCompletionType type)
607                 {
608                         GLib.debug("completion");
609                         if (d_proxy != null)
610                         {
611                                 d_proxy.completion(type);
612                         }
613                 }
614
615                 protected override Ggit.Cred? credentials(string url, string? username_from_url, Ggit.Credtype allowed_types) throws Error
616                 {
617  
618                         GLib.debug("get credentials %s  UN=%s", url, username_from_url);
619                         var uri = new Soup.URI(url);
620
621                         if (uri != null) {
622                                 var ret = this.netrc(uri.get_host());
623                                 if (ret != null) {
624                                         return ret;
625                                 }
626                                 
627                                 //return new Ggit.CredPlaintext(username_from_url, "test");
628                         }
629                         return null;
630                         /*var provider = d_remote.credentials_provider;
631
632                         if (provider != null)
633                         {
634                                 ret = provider.credentials(url, username_from_url, allowed_types);
635                         }
636
637                         if (ret == null && d_proxy != null)
638                         {
639                                 ret = d_proxy.credentials(url, username_from_url, allowed_types);
640                         }
641                         
642                         return ret;
643                         */
644                 }
645                 public  Ggit.Cred netrc(string domain) 
646                 {
647                         string str;
648                         GLib.FileUtils.get_contents(GLib.Environment.get_home_dir() + "/.netrc", out str);
649                         var lines = str.split("\n");
650                         for(var i=0; i< lines.length; i++) {
651                                 // assumes one line per entry.. if not we are buggered...
652                                 //GLib.debug("got %s" , lines[i]);
653                         
654                                 var bits =  Regex.split_simple ("[ \t]+", lines[i].strip());
655                                 if (bits.length < 6 || bits[0] != "machine" || bits[1] != domain) {
656                                         continue;
657                                 }
658                                 GLib.debug("found password?");
659                                 // we are gussing.... 
660                                 return new Ggit.CredPlaintext(bits[3], bits[5]);
661
662                         }
663                         return null;
664
665
666                 
667                 
668                 }
669                 
670         }
671         
672         
673
674 }