2 // valac -o /tmp/ggit Git.vala --pkg libgit2-glib-1.0 --pkg libsoup-2.4 --pkg gee-0.8 -g
8 GLib.Log.set_handler(null,
9 GLib.LogLevelFlags.LEVEL_DEBUG | GLib.LogLevelFlags.LEVEL_WARNING | GLib.LogLevelFlags.LEVEL_INFO,
22 var a = new GitLive.Repo("/home/alan/gitlive/gitlive");
23 a.mergeMasterIntoHead();
28 a.loadLocalBranches();
33 var a = new GitLive.Repo("/home/alan/git/test1-clone");
35 var str = (new GLib.DateTime.now_utc()).format("%Y-%m-%d %H:%M:%S");
36 GLib.FileUtils.set_contents("/home/alan/git/test1-clone/test1", str);
38 var ix = a.repo.get_index();
41 var treeoid = ix.write_tree();
43 var head = a.repo.get_head();
44 var parent = head.lookup() as Ggit.Commit;
45 Ggit.Commit[] parents = (parent == null) ?
46 new Ggit.Commit[] {} :
47 new Ggit.Commit[] { parent };
49 var tree = a.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree;// odd format..
51 var sig = new Ggit.Signature.now("Alan Knowles", "alan@roojs.com");
52 a.repo.create_commit("HEAD", sig, sig, null, "test commit " + str, tree, parents);
54 // mmh.. no git add/commit in library...
55 // string[] spawn_args = {"git", "commit", "-m", "test", "-a"};
56 //string[] spawn_env = Environ.get ();
57 // Process.spawn_sync ("/home/alan/git/test1-clone", spawn_args, spawn_env, SpawnFlags.SEARCH_PATH, null);
65 public class Repo : Object {
68 public Ggit.Repository repo;
71 public Repo(string path)
73 this.name = GLib.Path.get_basename(path);
74 this.repo = Ggit.Repository.open(GLib.File.new_for_path(path));
75 this.callbacks = new Callbacks(this);
78 Ggit.Branch head = null;
79 Gee.ArrayList<Ggit.Branch> branches = null;
80 Ggit.RemoteHead[] remote_heads = null;
81 public void loadLocalBranches(bool force = false)
83 if (!force && this.branches != null) {
87 this.branches = new Gee.ArrayList<Ggit.Branch>();
88 var r = this.repo.enumerate_branches(Ggit.BranchType.LOCAL);
90 var br = r.get() as Ggit.Branch;
91 //var head = this.repo.revparse("refs/heads/" + br.get_name() ).get_id();
92 //var rhead = this.repo.revparse(br.get_upstream().get_name() ).get_id();
93 //GLib.debug("got branch: name = %s upstream = %s oid = %s ",
94 // br.get_name(), br.get_upstream().get_name(),
96 this.branches.add(br);
98 GLib.debug("HEAD= %s", br.get_name());
107 public bool is_managed()
109 GLib.debug("is_managed: %d", this.repo.get_config().get_int32("gitlive.managed"));
110 return this.repo.get_config().get_int32("gitlive.managed") == 1;
114 public bool is_autocommit ()
116 GLib.debug("is_autocommit: %d", this.repo.get_config().get_int32("gitlive.autocommit"));
117 return this.repo.get_config().get_int32("gitlive.autocommit") == 1;
119 public void set_autocommit(bool val)
121 this.repo.get_config().set_int32("gitlive.autocommit", val ? 1 : 0);
125 public void walkDiff()
127 this.loadLocalBranches();
131 var oid = this.repo.revparse(this.head.get_name() ).get_id() ;
132 var moid = this.repo.revparse("refs/heads/master" ).get_id() ;
134 var a = new Ggit.RevisionWalker(this.repo);
135 a.set_sort_mode(Ggit.SortMode.TOPOLOGICAL);
139 for (var noid = a.next(); noid != null; noid= a.next()) {
140 //var commit = this.repo.lookup(noid, typeof(Ggit.Commit)) as Ggit.Commit;
141 GLib.debug("rev: %s",
146 var commit = this.repo.lookup(last, typeof(Ggit.Commit)) as Ggit.Commit;
147 var parent = commit.get_parents();
148 GLib.debug("parent = %s", parent.get_id(0).to_string());
149 var master_rev = parent.get_id(0);
150 var master_commit = this.repo.lookup_commit(master_rev);;
152 var head_commit = this.repo.lookup_commit(oid);
154 var master_tree = master_commit.get_tree();
155 var head_tree = head_commit.get_tree();
157 var diff = new Ggit.Diff.tree_to_tree(this.repo, master_tree, head_tree, new Ggit.DiffOptions());
159 diff.print(Ggit.DiffFormatType.PATCH, ( delta, hunk, line) => {
160 GLib.debug("%d: %s, %s", line.get_new_lineno(), line.get_origin().to_string(), line.get_text());
163 // let's try a merge..
164 var mo = new Ggit.MergeOptions();
165 mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
166 var ix = this.repo.merge_trees(master_tree, master_tree, head_tree, mo);
168 if (ix.has_conflicts()) {
169 GLib.debug("merge has conflicts");
172 var treeoid = ix.write_tree();
176 var parents = new Ggit.Commit[] { master_commit };
179 var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree;
181 var sig = new Ggit.Signature.now(
182 this.repo.get_config().get_string("user.name"),
183 this.repo.get_config().get_string("user.email")
185 this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
192 public void mergeMasterIntoHead()
194 // assumes head is not master...
195 this.loadLocalBranches();
196 GLib.debug("head rev = %s", this.head.get_name());
197 var head_oid = this.repo.revparse(this.head.get_name() ).get_id() ;
198 var master_oid = this.repo.revparse("refs/heads/master" ).get_id() ;
200 var master_commit = this.repo.lookup_commit(master_oid);;
201 var head_commit = this.repo.lookup_commit(head_oid);
204 var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
206 var anc_commit = this.repo.lookup_commit(anc_oid);
207 var anc_tree = anc_commit.get_tree();
209 var mo = new Ggit.MergeOptions();
210 var co = new Ggit.CheckoutOptions();
211 var commits = new Ggit.Commit[] { master_commit };
213 this.repo.merge(commits, mo, co);
215 if (ix.has_conflicts()) {
216 GLib.debug("merge has conflicts");
220 var cfg = this.repo.get_config().snapshot();
221 var sig = new Ggit.Signature.now(
222 cfg.get_string("user.name"),
223 cfg.get_string("user.email")
226 var parents = new Ggit.OId[] { anc_commit.get_id() };
228 var treeoid = ix.write_tree_to(this.repo);
230 this.repo.create_commit_from_ids("HEAD",
231 sig, sig, null, "Test Merge", treeoid, parents);
234 var master_tree = master_commit.get_tree();
235 var head_tree = head_commit.get_tree();
236 var mo = new Ggit.MergeOptions();
237 mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
238 var ix = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
240 // might be conflicts..
241 this.repo.checkout_index(ix, new Ggit.CheckoutOptions());
242 var treeoid = ix.write_tree();
245 var parents = new Ggit.Commit[] { master_commit };
248 var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree;
251 this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
258 public bool doMergeClose(string commit_message)
260 this.loadLocalBranches(true);
261 var oldbranch = this.head.get_name();
262 // going to asume this is merge trees..
263 string [] cmd = { "merge", "--squash", oldbranch };
265 cmd = { "commit", "-a" , "-m", commit_message };
268 this.loadBranches(); // updates lastrev..
270 var notification = new Notify.Notification(
271 "Merged branch %s to %s".printf(oldbranch, master),
277 notification.set_timeout(5);
285 public bool is_auto_branch ()
287 if (this.name == "gitlog") {
291 if (this.is_managed()) {
299 public void loadRemoteHeads(bool force = false)
302 if (!force && this.remote_heads != null) {
305 var r = this.repo.lookup_remote("origin");
306 r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
307 this.remote_heads = r.list();
313 Ggit.Branch? getBranch(string remote_name, string remote_branch_name)
315 //GLib.debug("bn=%s",remote_branch_name);
316 if (remote_branch_name.has_prefix("refs/remotes/")) {
320 var target = remote_branch_name.replace("refs/heads/", remote_name+"/") .replace("refs/remotes/", "");
321 if (target == "HEAD") {
322 target = remote_name +"/master";
325 foreach(var br in this.branches) {
326 // GLib.debug("test:%s=%s", br.get_upstream().get_shorthand() , target);
327 if ( br.get_upstream().get_shorthand() == target) {
332 //GLib.debug("missing %s", remote_branch_name);
338 public void fetchAll()
340 this.loadLocalBranches();
341 this.loadRemoteHeads();
343 // remotes probably will not work with http auth..
344 //var ar = this.repo.list_remotes();
345 //foreach(var n in ar) {
348 GLib.debug("got remote '%s'", n);
349 var r = this.repo.lookup_remote(n);
350 GLib.debug("connecting '%s'", r.get_url());
353 string[] h = { "a = 1" };
354 r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
357 GLib.debug("Got Error Message: %s", e.message);
362 foreach(var rh in this.remote_heads) {
363 if (rh.get_name().has_prefix("refs/remotes/")) {
367 var br = this.getBranch(n, rh.get_name());
369 /*GLib.debug("got heads: name=%s rev=%s localrev=%s",
371 rh.get_oid().to_string(),
372 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
375 var loc_oid = this.repo.revparse(br.get_name() ).get_id();
376 size_t ahead, behind;
377 this.repo.get_ahead_behind(
384 if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
390 far += ("+refs/heads/" + br.get_name()) + ":refs/remotes/" + n + "/" + rh.get_name().replace("refs/heads/","");
393 if (far.length < 1) {
394 GLib.debug("no fetch required.. it's uptodate");
399 GLib.debug("getting remote specs '%s', %d", n, far.length);
402 var far = r.get_fetch_specs();
404 foreach(var rs in far) {
405 GLib.debug("got remote spec: %s", rs);
409 var options = new Ggit.FetchOptions();
410 options.set_remote_callbacks(this.callbacks);
411 //yield Async.thread(() => {
413 r.download(far, options);
424 public void pushAll()
427 this.loadLocalBranches();
428 this.loadRemoteHeads();
429 // remotes probably will not work with http auth..
430 //var ar = this.repo.list_remotes();
433 GLib.debug("got remote '%s'", n);
434 var r = this.repo.lookup_remote(n);
435 GLib.debug("connecting '%s'", r.get_url());
437 r.connect(Ggit.Direction.PUSH, this.callbacks, null, null);
439 //GLib.debug("getting specs '%s'", n);
442 this.repo.add_remote_push(
444 "+%s:%s".printf(head.get_shorthand(),head.get_name())
449 var heads = r.list();
450 foreach(var rh in heads) {
451 if (rh.get_name().has_prefix("refs/remotes/")) {
455 var br = this.getBranch(n, rh.get_name());
457 GLib.debug("got heads: name=%s rev=%s localrev=%s",
459 rh.get_oid().to_string(),
460 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
462 var loc_oid = this.repo.revparse(br.get_name() ).get_id();
463 size_t ahead, behind;
464 this.repo.get_ahead_behind(
471 if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
477 far += ("+refs/heads/" + br.get_name()) + ":"+ rh.get_name();
480 if (far.length < 1) {
481 GLib.debug("no push required.. it's uptodate");
486 /*var head = this.repo.get_head();
488 far += "+%s:%s".printf(head.get_name(),head.get_name());
490 foreach(var rs in far) {
491 GLib.debug("got remote spec: %s", rs);
495 var popts = new Ggit.PushOptions();
496 popts.callbacks = this.callbacks;
499 GLib.debug("Push done?");
512 private class Callbacks : Ggit.RemoteCallbacks
514 //private Remote d_remote;
515 private Ggit.RemoteCallbacks? d_proxy = null;
517 public delegate void TransferProgress(Ggit.TransferProgress stats);
518 //private TransferProgress? d_transfer_progress;
520 public Callbacks( Repo repo) //, Ggit.RemoteCallbacks? proxy) //,Remote remote, owned TransferProgress? transfer_progress)
524 //d_transfer_progress = (owned)transfer_progress;
527 protected override void progress(string message)
529 GLib.debug("progress: %s", message);
532 d_proxy.progress(message);
536 protected override void transfer_progress(Ggit.TransferProgress stats)
538 GLib.debug("transfer_progress");
540 if (d_transfer_progress != null)
542 d_transfer_progress(stats);
547 d_proxy.transfer_progress(stats);
552 protected override void update_tips(string refname, Ggit.OId a, Ggit.OId b)
554 GLib.debug("update_tips");
555 //d_remote.tip_updated(refname, a, b);
559 d_proxy.update_tips(refname, a, b);
563 protected override void completion(Ggit.RemoteCompletionType type)
565 GLib.debug("completion");
568 d_proxy.completion(type);
572 protected override Ggit.Cred? credentials(string url, string? username_from_url, Ggit.Credtype allowed_types) throws Error
575 GLib.debug("get credentials %s UN=%s", url, username_from_url);
576 var uri = new Soup.URI(url);
579 var ret = this.netrc(uri.get_host());
584 //return new Ggit.CredPlaintext(username_from_url, "test");
587 /*var provider = d_remote.credentials_provider;
589 if (provider != null)
591 ret = provider.credentials(url, username_from_url, allowed_types);
594 if (ret == null && d_proxy != null)
596 ret = d_proxy.credentials(url, username_from_url, allowed_types);
602 public Ggit.Cred netrc(string domain)
605 GLib.FileUtils.get_contents(GLib.Environment.get_home_dir() + "/.netrc", out str);
606 var lines = str.split("\n");
607 for(var i=0; i< lines.length; i++) {
608 // assumes one line per entry.. if not we are buggered...
609 //GLib.debug("got %s" , lines[i]);
611 var bits = Regex.split_simple ("[ \t]+", lines[i].strip());
612 if (bits.length < 6 || bits[0] != "machine" || bits[1] != domain) {
615 GLib.debug("found password?");
616 // we are gussing....
617 return new Ggit.CredPlaintext(bits[3], bits[5]);