git.roojs.org Git - gitlive/blob - 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
 224                 public void diffhead()
 225                 {
 226                         var r = this.repo.enumerate_branches(Ggit.BranchType.LOCAL);
 227                         Ggit.GitBranch head;
 228                         while (r.next()) {
 229                                 var gbr = r.get() as Ggit.Branch;
 230                                 if (gbr.is_head()) {
 231                                         head = gbr;
 232                                 }
 233                         }
 234
 235                 }
 236
 237
 238                 public void mergeMasterIntoHead()
 239                 {
 240                         // assumes head is not master...
 241                         this.loadLocalBranches();
 242                         GLib.debug("head rev = %s", this.head.get_name());
 243                         var head_oid =  this.repo.revparse(this.head.get_name() ).get_id()  ;
 244                         //var master_oid =  this.repo.revparse("refs/heads/master" ).get_id()  ;
 245                         var master_oid =  this.repo.revparse("HEAD" ).get_id()  ;
 246
 247                         var master_commit  = this.repo.lookup_commit(master_oid);;
 248                         var head_commit = this.repo.lookup_commit(head_oid);
 249
 250
 251                         var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
 252
 253                         var anc_commit = this.repo.lookup_commit(anc_oid);
 254                         var anc_tree = anc_commit.get_tree();
 255
 256                         var mo = new Ggit.MergeOptions();
 257                         var co = new Ggit.CheckoutOptions();
 258                         var the_ref = this.repo.lookup_reference_dwim("refs/heads/master");
 259
 260                     var ac = new Ggit.AnnotatedCommit.from_ref(this.repo, the_ref);
 261
 262                         var commits =   new Ggit.AnnotatedCommit[] { ac };
 263
 264                         this.repo.merge(commits, mo, co);
 265
 266                         var cfg = this.repo.get_config().snapshot();
 267
 268                     var sig = new Ggit.Signature.now(
 269                                         cfg.get_string("user.name"),
 270                                         cfg.get_string("user.email")
 271                         );
 272                         var new_head = this.repo.get_head();
 273                         var oid = new_head.get_target();
 274
 275                         var ix = this.repo.get_index();
 276
 277                         ix.write();
 278                         var treeoid = ix.write_tree();
 279
 280                         var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree))  as   Ggit.Tree;
 281
 282                         var parent = new_head.lookup() as Ggit.Commit;
 283                         Ggit.Commit[] parents =  new Ggit.Commit[] { parent };
 284
 285                         this.repo.create_commit("refs/heads/" + this.head.get_name(), sig, sig, null, "Test Merge", new_tree, parents);
 286
 287                 }
 288
 289
 290
 291
 292
 293                 /*
 294                 public bool doMergeClose(string commit_message)
 295                 {
 296                         this.loadLocalBranches(true);
 297                         var oldbranch = this.head.get_name();
 298             // going to asume this is merge trees..
 299                            string [] cmd = { "merge",   "--squash",  oldbranch };
 300                            this.git( cmd );
 301                            cmd = { "commit",   "-a" , "-m",  commit_message };
 302                            this.git( cmd );
 303                            this.push();
 304                            this.loadBranches(); // updates lastrev..
 305
 306                        var notification = new Notify.Notification(
 307                                "Merged branch %s to %s".printf(oldbranch, master),
 308                                "",
 309                                 "dialog-information"
 310
 311                        );
 312
 313                        notification.set_timeout(5);
 314                        notification.show();
 315
 316
 317                 }
 318                 */
 319
 320
 321                 public bool is_auto_branch ()
 322                 {
 323                         if (this.name == "gitlog") {
 324                                 return false;
 325                         }
 326                         // check remote...
 327                         if (this.is_managed()) {
 328                                 return true;
 329                         }
 330                         return false;
 331
 332
 333                 }
 334
 335                 public async void loadRemoteHeads(bool force = false)
 336                 {
 337                     SourceFunc callback = loadRemoteHeads.callback;
 338
 339                         ThreadFunc<bool> run = () => {
 340
 341                                 if (!force && this.remote_heads != null) {
 342                                         return true;;
 343                                 }
 344                                 var r = this.repo.lookup_remote("origin");
 345                                 r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
 346                                 yield;
 347                                 this.remote_heads = r.list();
 348
 349                                 foreach(var br in this.remote_heads) {
 350                                         if (!br.get_name().has_prefix("refs/heads/")) {
 351                                                 continue;
 352                                         }
 353
 354                                         GLib.debug("Remote: name=%s  oid=%s local_oid=%s is_local=%s",
 355                                                 br.get_name(),
 356                                                 br.get_oid().to_string(),
 357                                                 br.get_local_oid().to_string(),
 358                                                 br.is_local() ? "Y" : "n"
 359                                                 );
 360                                 }
 361                                 Idle.add((owned) callback);
 362                                 return true;;
 363                         };
 364                         new Thread<bool>("loadRemoteHeads-" , run);
 365                         yield;
 366
 367
 368                 }
 369
 370
 371                 Ggit.Branch? getBranch(string remote_name, string remote_branch_name)
 372                 {
 373                          //GLib.debug("bn=%s",remote_branch_name);
 374                          if (remote_branch_name.has_prefix("refs/remotes/")) {
 375                                  return null;
 376                          }
 377
 378                          var target = remote_branch_name.replace("refs/heads/", remote_name+"/") .replace("refs/remotes/", "");
 379                         if (target == "HEAD") {
 380                                 target = remote_name +"/master";
 381                         }
 382
 383                         foreach(var br in this.branches) {
 384                         //      GLib.debug("test:%s=%s", br.get_upstream().get_shorthand() , target);
 385                                 if ( br.get_upstream().get_shorthand() == target) {
 386                                         return br;
 387                                 }
 388
 389                         }
 390                         //GLib.debug("missing %s", remote_branch_name);
 391                         return null;
 392
 393                 }
 394
 395
 396                 public void fetchAll()
 397                 {
 398                         this.loadLocalBranches();
 399                         this.loadRemoteHeads();
 400
 401                         // remotes probably will not work with http auth..
 402                         //var ar = this.repo.list_remotes();
 403                         //foreach(var n in ar) {
 404                         var n = "origin";
 405
 406                                 GLib.debug("got remote '%s'", n);
 407                                 var r = this.repo.lookup_remote(n);
 408                                 GLib.debug("connecting '%s'", r.get_url());
 409
 410                                 try {
 411                                         string[] h = { "a = 1" };
 412                                         r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
 413
 414                                 } catch (Error e) {
 415                                         GLib.debug("Got Error Message: %s", e.message);
 416                                         return;
 417                                 }
 418                                 string[] far = {};
 419
 420                                 foreach(var rh in this.remote_heads) {
 421                                         if (rh.get_name().has_prefix("refs/remotes/")) {
 422                                                    continue;
 423                                          }
 424
 425                                         var br = this.getBranch(n, rh.get_name());
 426
 427                                         /*GLib.debug("got heads: name=%s   rev=%s  localrev=%s",
 428                                                 rh.get_name(),
 429                                                 rh.get_oid().to_string(),
 430                                                 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
 431                                         );
 432                                         */
 433                                         //var loc_oid = this.repo.revparse(br.get_name() ).get_id();
 434
 435                                         var loc_oid = br.get_target();
 436
 437                                         size_t ahead, behind;
 438                                         this.repo.get_ahead_behind(
 439                                                 loc_oid,
 440                                                 rh.get_oid(),
 441                                                 out ahead,
 442                                                 out behind
 443                                         );
 444
 445                                         if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
 446                                                 continue;
 447                                         }
 448                                         if (ahead > 0) {
 449                                                 continue;
 450                                         }
 451                                         far += ("+refs/heads/" + br.get_name()) + ":refs/remotes/" + n + "/" + rh.get_name().replace("refs/heads/","");
 452                                 }
 453
 454                                 if (far.length < 1) {
 455                                         GLib.debug("no fetch required.. it's uptodate");
 456                                         r.disconnect();
 457                                         return;
 458                                 }
 459
 460                                 GLib.debug("getting remote specs '%s', %d", n, far.length);
 461
 462 /*
 463                                 var far = r.get_fetch_specs();
 464                                 */
 465                                 foreach(var rs in far) {
 466                                         GLib.debug("got remote spec: %s", rs);
 467
 468                                 }
 469
 470                                 var options = new Ggit.FetchOptions();
 471                                 options.set_remote_callbacks(this.callbacks);
 472                                 //yield Async.thread(() => {
 473
 474                                         r.download(far, options);
 475                                 //});
 476                                 r.disconnect();
 477
 478                                 //r.download(
 479
 480
 481                 }
 482
 483
 484
 485                 public void pushAll()
 486                 {
 487
 488                         this.loadLocalBranches();
 489                         this.loadRemoteHeads();
 490                         // remotes probably will not work with http auth..
 491                         //var ar = this.repo.list_remotes();
 492                         var n = "origin";
 493
 494                                 GLib.debug("got remote '%s'", n);
 495                                 var r = this.repo.lookup_remote(n);
 496                                 GLib.debug("connecting '%s'", r.get_url());
 497
 498                                 r.connect(Ggit.Direction.PUSH, this.callbacks, null, null);
 499
 500                                 //GLib.debug("getting specs '%s'", n);
 501                                 /*
 502
 503                                 this.repo.add_remote_push(
 504                                         "origin",
 505                                         "+%s:%s".printf(head.get_shorthand(),head.get_name())
 506                                 );
 507  */
 508
 509                                 string[] far = {};
 510                                 var heads = r.list();
 511                                 foreach(var rh in heads) {
 512                                         if (rh.get_name().has_prefix("refs/remotes/")) {
 513                                                    continue;
 514                                          }
 515
 516                                         var br = this.getBranch(n, rh.get_name());
 517                                         /*
 518                                         GLib.debug("got heads: name=%s   rev=%s  localrev=%s",
 519                                                 rh.get_name(),
 520                                                 rh.get_oid().to_string(),
 521                                                 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
 522                                         );*/
 523                                         var loc_oid = this.repo.revparse(br.get_name() ).get_id();
 524                                         size_t ahead, behind;
 525                                         this.repo.get_ahead_behind(
 526                                                 loc_oid,
 527                                                 rh.get_oid(),
 528                                                 out ahead,
 529                                                 out behind
 530                                         );
 531
 532                                         if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
 533                                                 continue;
 534                                         }
 535                                         if (behind > 0) {
 536                                                 continue;
 537                                         }
 538                                         far += ("+refs/heads/" + br.get_name()) + ":"+ rh.get_name();
 539                                 }
 540
 541                                 if (far.length < 1) {
 542                                         GLib.debug("no push required.. it's uptodate");
 543                                         r.disconnect();
 544                                         return;
 545                                 }
 546
 547                                 /*var head = this.repo.get_head();
 548                                 string[] far = {};
 549                                 far += "+%s:%s".printf(head.get_name(),head.get_name());
 550                                 */
 551                                 foreach(var rs in far) {
 552                                         GLib.debug("got remote spec: %s", rs);
 553
 554                                 }
 555
 556                                 var popts = new Ggit.PushOptions();
 557                                  popts.callbacks = this.callbacks;
 558                                 GLib.debug("Push?");
 559                                 r.upload(far,popts);
 560                                 GLib.debug("Push done?");
 561                                 r.disconnect();
 562
 563
 564                                 //r.download(
 565
 566
 567                 }
 568
 569
 570
 571         }
 572
 573         private class Callbacks : Ggit.RemoteCallbacks
 574         {
 575                 //private Remote d_remote;
 576                 private Ggit.RemoteCallbacks? d_proxy = null;
 577
 578                 public delegate void TransferProgress(Ggit.TransferProgress stats);
 579                 //private TransferProgress? d_transfer_progress;
 580
 581                 public Callbacks( Repo repo)  //, Ggit.RemoteCallbacks? proxy) //,Remote remote, owned TransferProgress? transfer_progress)
 582                 {
 583                         //d_remote = remote;
 584                         //d_proxy = proxy;
 585                         //d_transfer_progress = (owned)transfer_progress;
 586                 }
 587
 588                 protected override void progress(string message)
 589                 {
 590                         GLib.debug("progress: %s", message);
 591                         if (d_proxy != null)
 592                         {
 593                                 d_proxy.progress(message);
 594                         }
 595                 }
 596
 597                 protected override void transfer_progress(Ggit.TransferProgress stats)
 598                 {
 599                         GLib.debug("transfer_progress");
 600                         /*
 601                         if (d_transfer_progress != null)
 602                         {
 603                                 d_transfer_progress(stats);
 604                         }
 605
 606                         if (d_proxy != null)
 607                         {
 608                                 d_proxy.transfer_progress(stats);
 609                         }
 610                         */
 611                 }
 612
 613                 protected override void update_tips(string refname, Ggit.OId a, Ggit.OId b)
 614                 {
 615                         GLib.debug("update_tips");
 616                         //d_remote.tip_updated(refname, a, b);
 617
 618                         if (d_proxy != null)
 619                         {
 620                                 d_proxy.update_tips(refname, a, b);
 621                         }
 622                 }
 623
 624                 protected override void completion(Ggit.RemoteCompletionType type)
 625                 {
 626                         GLib.debug("completion");
 627                         if (d_proxy != null)
 628                         {
 629                                 d_proxy.completion(type);
 630                         }
 631                 }
 632
 633                 protected override Ggit.Cred? credentials(string url, string? username_from_url, Ggit.Credtype allowed_types) throws Error
 634                 {
 635
 636                         GLib.debug("get credentials %s  UN=%s", url, username_from_url);
 637                         var uri = new Soup.URI(url);
 638
 639                         if (uri != null) {
 640                                 var ret = this.netrc(uri.get_host());
 641                                 if (ret != null) {
 642                                         return ret;
 643                                 }
 644
 645                                 //return new Ggit.CredPlaintext(username_from_url, "test");
 646                         }
 647                         return null;
 648                         /*var provider = d_remote.credentials_provider;
 649
 650                         if (provider != null)
 651                         {
 652                                 ret = provider.credentials(url, username_from_url, allowed_types);
 653                         }
 654
 655                         if (ret == null && d_proxy != null)
 656                         {
 657                                 ret = d_proxy.credentials(url, username_from_url, allowed_types);
 658                         }
 659
 660                         return ret;
 661                         */
 662                 }
 663                 public  Ggit.Cred netrc(string domain)
 664                 {
 665                         string str;
 666                         GLib.FileUtils.get_contents(GLib.Environment.get_home_dir() + "/.netrc", out str);
 667                         var lines = str.split("\n");
 668                         for(var i=0; i< lines.length; i++) {
 669                                 // assumes one line per entry.. if not we are buggered...
 670                                 //GLib.debug("got %s" , lines[i]);
 671
 672                                 var bits =  Regex.split_simple ("[ \t]+", lines[i].strip());
 673                                 if (bits.length < 6 || bits[0] != "machine" || bits[1] != domain) {
 674                                         continue;
 675                                 }
 676                                 GLib.debug("found password?");
 677                                 // we are gussing....
 678                                 return new Ggit.CredPlaintext(bits[3], bits[5]);
 679
 680                         }
 681                         return null;
 682
 683
 684
 685
 686                 }
 687
 688         }
 689
 690
 691
 692 }