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() ;
199 var master_oid = this.repo.revparse("HEAD" ).get_id() ;
201 var master_commit = this.repo.lookup_commit(master_oid);;
202 var head_commit = this.repo.lookup_commit(head_oid);
205 var anc_oid = this.repo.merge_base(master_commit.get_id(), head_commit.get_id());
207 var anc_commit = this.repo.lookup_commit(anc_oid);
208 var anc_tree = anc_commit.get_tree();
210 var mo = new Ggit.MergeOptions();
211 var co = new Ggit.CheckoutOptions();
212 var the_ref = this.repo.lookup_reference_dwim("refs/heads/master");
214 var ac = new Ggit.AnnotatedCommit.from_ref(this.repo, the_ref);
216 var commits = new Ggit.AnnotatedCommit[] { ac };
218 this.repo.merge(commits, mo, co);
220 if (ix.has_conflicts()) {
221 GLib.debug("merge has conflicts");
225 var cfg = this.repo.get_config().snapshot();
226 var sig = new Ggit.Signature.now(
227 cfg.get_string("user.name"),
228 cfg.get_string("user.email")
231 var parents = new Ggit.OId[] { anc_commit.get_id() };
233 var treeoid = ix.write_tree_to(this.repo);
235 this.repo.create_commit_from_ids("HEAD",
236 sig, sig, null, "Test Merge", treeoid, parents);
239 var master_tree = master_commit.get_tree();
240 var head_tree = head_commit.get_tree();
241 var mo = new Ggit.MergeOptions();
242 mo.set_file_favor(Ggit.MergeFileFavor.THEIRS);
243 var ix = this.repo.merge_trees(anc_tree, master_tree, head_tree, mo);
245 // might be conflicts..
246 this.repo.checkout_index(ix, new Ggit.CheckoutOptions());
247 var treeoid = ix.write_tree();
250 var parents = new Ggit.Commit[] { master_commit };
253 var new_tree = this.repo.lookup(treeoid,typeof (Ggit.Tree)) as Ggit.Tree;
256 this.repo.create_commit("HEAD", sig, sig, null, "Test Merge", new_tree, parents);
263 public bool doMergeClose(string commit_message)
265 this.loadLocalBranches(true);
266 var oldbranch = this.head.get_name();
267 // going to asume this is merge trees..
268 string [] cmd = { "merge", "--squash", oldbranch };
270 cmd = { "commit", "-a" , "-m", commit_message };
273 this.loadBranches(); // updates lastrev..
275 var notification = new Notify.Notification(
276 "Merged branch %s to %s".printf(oldbranch, master),
282 notification.set_timeout(5);
290 public bool is_auto_branch ()
292 if (this.name == "gitlog") {
296 if (this.is_managed()) {
304 public void loadRemoteHeads(bool force = false)
307 if (!force && this.remote_heads != null) {
310 var r = this.repo.lookup_remote("origin");
311 r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
312 this.remote_heads = r.list();
318 Ggit.Branch? getBranch(string remote_name, string remote_branch_name)
320 //GLib.debug("bn=%s",remote_branch_name);
321 if (remote_branch_name.has_prefix("refs/remotes/")) {
325 var target = remote_branch_name.replace("refs/heads/", remote_name+"/") .replace("refs/remotes/", "");
326 if (target == "HEAD") {
327 target = remote_name +"/master";
330 foreach(var br in this.branches) {
331 // GLib.debug("test:%s=%s", br.get_upstream().get_shorthand() , target);
332 if ( br.get_upstream().get_shorthand() == target) {
337 //GLib.debug("missing %s", remote_branch_name);
343 public void fetchAll()
345 this.loadLocalBranches();
346 this.loadRemoteHeads();
348 // remotes probably will not work with http auth..
349 //var ar = this.repo.list_remotes();
350 //foreach(var n in ar) {
353 GLib.debug("got remote '%s'", n);
354 var r = this.repo.lookup_remote(n);
355 GLib.debug("connecting '%s'", r.get_url());
358 string[] h = { "a = 1" };
359 r.connect(Ggit.Direction.FETCH, this.callbacks, null, null);
362 GLib.debug("Got Error Message: %s", e.message);
367 foreach(var rh in this.remote_heads) {
368 if (rh.get_name().has_prefix("refs/remotes/")) {
372 var br = this.getBranch(n, rh.get_name());
374 /*GLib.debug("got heads: name=%s rev=%s localrev=%s",
376 rh.get_oid().to_string(),
377 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
380 var loc_oid = this.repo.revparse(br.get_name() ).get_id();
381 size_t ahead, behind;
382 this.repo.get_ahead_behind(
389 if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
395 far += ("+refs/heads/" + br.get_name()) + ":refs/remotes/" + n + "/" + rh.get_name().replace("refs/heads/","");
398 if (far.length < 1) {
399 GLib.debug("no fetch required.. it's uptodate");
404 GLib.debug("getting remote specs '%s', %d", n, far.length);
407 var far = r.get_fetch_specs();
409 foreach(var rs in far) {
410 GLib.debug("got remote spec: %s", rs);
414 var options = new Ggit.FetchOptions();
415 options.set_remote_callbacks(this.callbacks);
416 //yield Async.thread(() => {
418 r.download(far, options);
429 public void pushAll()
432 this.loadLocalBranches();
433 this.loadRemoteHeads();
434 // remotes probably will not work with http auth..
435 //var ar = this.repo.list_remotes();
438 GLib.debug("got remote '%s'", n);
439 var r = this.repo.lookup_remote(n);
440 GLib.debug("connecting '%s'", r.get_url());
442 r.connect(Ggit.Direction.PUSH, this.callbacks, null, null);
444 //GLib.debug("getting specs '%s'", n);
447 this.repo.add_remote_push(
449 "+%s:%s".printf(head.get_shorthand(),head.get_name())
454 var heads = r.list();
455 foreach(var rh in heads) {
456 if (rh.get_name().has_prefix("refs/remotes/")) {
460 var br = this.getBranch(n, rh.get_name());
462 GLib.debug("got heads: name=%s rev=%s localrev=%s",
464 rh.get_oid().to_string(),
465 br == null ? "?": this.repo.revparse(br.get_name() ).get_id().to_string()
467 var loc_oid = this.repo.revparse(br.get_name() ).get_id();
468 size_t ahead, behind;
469 this.repo.get_ahead_behind(
476 if (rh.get_oid().to_string() == this.repo.revparse(br.get_name() ).get_id().to_string()) {
482 far += ("+refs/heads/" + br.get_name()) + ":"+ rh.get_name();
485 if (far.length < 1) {
486 GLib.debug("no push required.. it's uptodate");
491 /*var head = this.repo.get_head();
493 far += "+%s:%s".printf(head.get_name(),head.get_name());
495 foreach(var rs in far) {
496 GLib.debug("got remote spec: %s", rs);
500 var popts = new Ggit.PushOptions();
501 popts.callbacks = this.callbacks;
504 GLib.debug("Push done?");
517 private class Callbacks : Ggit.RemoteCallbacks
519 //private Remote d_remote;
520 private Ggit.RemoteCallbacks? d_proxy = null;
522 public delegate void TransferProgress(Ggit.TransferProgress stats);
523 //private TransferProgress? d_transfer_progress;
525 public Callbacks( Repo repo) //, Ggit.RemoteCallbacks? proxy) //,Remote remote, owned TransferProgress? transfer_progress)
529 //d_transfer_progress = (owned)transfer_progress;
532 protected override void progress(string message)
534 GLib.debug("progress: %s", message);
537 d_proxy.progress(message);
541 protected override void transfer_progress(Ggit.TransferProgress stats)
543 GLib.debug("transfer_progress");
545 if (d_transfer_progress != null)
547 d_transfer_progress(stats);
552 d_proxy.transfer_progress(stats);
557 protected override void update_tips(string refname, Ggit.OId a, Ggit.OId b)
559 GLib.debug("update_tips");
560 //d_remote.tip_updated(refname, a, b);
564 d_proxy.update_tips(refname, a, b);
568 protected override void completion(Ggit.RemoteCompletionType type)
570 GLib.debug("completion");
573 d_proxy.completion(type);
577 protected override Ggit.Cred? credentials(string url, string? username_from_url, Ggit.Credtype allowed_types) throws Error
580 GLib.debug("get credentials %s UN=%s", url, username_from_url);
581 var uri = new Soup.URI(url);
584 var ret = this.netrc(uri.get_host());
589 //return new Ggit.CredPlaintext(username_from_url, "test");
592 /*var provider = d_remote.credentials_provider;
594 if (provider != null)
596 ret = provider.credentials(url, username_from_url, allowed_types);
599 if (ret == null && d_proxy != null)
601 ret = d_proxy.credentials(url, username_from_url, allowed_types);
607 public Ggit.Cred netrc(string domain)
610 GLib.FileUtils.get_contents(GLib.Environment.get_home_dir() + "/.netrc", out str);
611 var lines = str.split("\n");
612 for(var i=0; i< lines.length; i++) {
613 // assumes one line per entry.. if not we are buggered...
614 //GLib.debug("got %s" , lines[i]);
616 var bits = Regex.split_simple ("[ \t]+", lines[i].strip());
617 if (bits.length < 6 || bits[0] != "machine" || bits[1] != domain) {
620 GLib.debug("found password?");
621 // we are gussing....
622 return new Ggit.CredPlaintext(bits[3], bits[5]);