10 static GitRepo _GitRepo;
12 public class GitRepo : Object
15 public Gee.ArrayList<GitMonitorQueue> cmds;
19 public string git_working_dir;
20 public bool debug = false;
21 public bool has_local_changes = false;
22 public string host = "";
23 public string git_status;
24 public string git_diff;
25 public string ahead_or_behind = "";
27 public Gee.HashMap<string,bool> ignore_files;
28 public GitBranch currentBranch;
29 public Gee.HashMap<string,GitBranch> branches; // accessed in GitBranch..
30 public RooTicket? activeTicket;
31 public Gee.HashMap<string,GitRepo> cache;
35 public static GitRepo singleton()
37 if (_GitRepo == null) {
38 _GitRepo = new GitRepo.single();
39 _GitRepo.cache = new Gee.HashMap<string,GitRepo>();
45 * index of.. matching gitpath..
47 public static int indexOf( Array<GitRepo> repos, string gitpath) {
48 // make a fake object to compare against..
49 var test_repo = GitRepo.get(gitpath);
51 for(var i =0; i < repos.length; i++) {
52 if (repos.index(i).gitdir == test_repo.gitdir) {
64 public static Array<GitRepo> list()
67 //if (GitRepo.list_cache != null) {
68 // unowned Array<GitRepo> ret = GitRepo.list_cache;
71 var cache = GitRepo.singleton().cache;
72 var list_cache = new Array<GitRepo>();
74 var dir = Environment.get_home_dir() + "/gitlive";
76 var f = File.new_for_path(dir);
77 FileEnumerator file_enum;
79 file_enum = f.enumerate_children(
80 FileAttribute.STANDARD_DISPLAY_NAME + ","+
81 FileAttribute.STANDARD_TYPE,
82 FileQueryInfoFlags.NONE,
95 next_file = file_enum.next_file(null);
96 if (next_file == null) {
101 GLib.debug("Error: %s",e.message);
105 //print("got a file " + next_file.sudo () + '?=' + Gio.FileType.DIRECTORY);
107 if (next_file.get_file_type() != FileType.DIRECTORY) {
112 if (next_file.get_file_type() == FileType.SYMBOLIC_LINK) {
117 if (next_file.get_display_name()[0] == '.') {
121 var sp = dir+"/"+next_file.get_display_name();
123 var gitdir = dir + "/" + next_file.get_display_name() + "/.git";
125 if (!FileUtils.test(gitdir, FileTest.IS_DIR)) {
129 var rep = GitRepo.get( sp );
130 list_cache.append_val(rep);
138 public static GitRepo get(string path)
140 var cache = GitRepo.singleton().cache;
141 if (cache.has_key(path)) {
142 return cache.get(path);
144 return new GitRepo(path);
147 private GitRepo.single() {
148 // used to create the signleton
153 * @param {Object} cfg - Configuration
154 * (basically repopath is currently only critical one.)
158 private GitRepo(string path) {
160 this.name = File.new_for_path(path).get_basename();
161 this.ignore_files = new Gee.HashMap<string,bool>();
163 this.git_working_dir = path;
164 this.gitdir = path + "/.git";
165 if (!FileUtils.test(this.gitdir , FileTest.IS_DIR)) {
166 this.gitdir = path; // naked...
168 this.cmds = new Gee.ArrayList<GitMonitorQueue> ();
170 var cache = GitRepo.singleton().cache;
171 //Repo.superclass.constructor.call(this,cfg);
172 if ( !cache.has_key(path) ) {
173 cache.set( path, this);
176 var r = this.git({ "remote" , "get-url" , "--push" , "origin"});
177 var uri = new Soup.URI(r);
178 this.host = uri.get_host();
182 this.loadActiveTicket();
186 public bool is_master_branch()
188 // special branches that do not allow autopushing now...
189 return this.currentBranch.name == "master" || this.currentBranch.name == "roojs";
192 public void init_config()
195 if (this.get_config("managed") == "") {
196 this.set_config("managed", this.host != "git.roojs.com" ? "1" : "0");
204 public string get_config(string key) {
205 return this.git({ "config" , "gitlive." + key);
207 public string set_config(string key, string value) {
208 return this.git({ "config" , "gitlive." + key, value);
211 public bool is_managed()
213 // is it a roojs origin?
215 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
216 var r = this.git({ "config" , "gitlive.managed");
218 return FileUtils.test(this.gitdir + "/.gitlive-managed" , FileTest.EXISTS);
220 // otherwise see if unmanaged is set to disable it..
221 return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS);
226 public bool is_autocommit ()
228 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
230 public void set_autocommit(bool val)
233 var cur = this.is_autocommit();
234 GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
236 return; // no change..
239 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
242 FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" );
247 public bool is_auto_branch ()
249 if (this.name == "gitlog") {
253 if (this.is_managed()) {
261 public void set_auto_branch(bool val)
264 var cur = this.is_auto_branch();
265 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
268 return; // no change..
270 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
271 // remote is not our server..
273 FileUtils.set_contents(this.gitdir + "/.gitlive-managed" , "x");
275 FileUtils.remove(this.gitdir + "/.gitlive-managed" );
282 FileUtils.remove(this.gitdir + "/.gitlive-unmanaged" );
284 FileUtils.set_contents(this.gitdir + "/.gitlive-unmanaged" , "x");
290 public bool is_autopush ()
292 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
294 public void set_autopush(bool val)
297 var cur = this.is_autopush();
298 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
300 return; // no change..
303 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
306 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
312 public void loadStatus()
314 var r = this.git({ "status" , "--porcelain" });
316 this.has_local_changes = r.length > 0;
318 var rs = this.git({ "status" , "-sb" });
320 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
323 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
327 public void loadBranches()
330 GitBranch.loadBranches(this);
336 public string branchesToString()
339 foreach( var br in this.branches.values) {
343 ret += ret.length > 0 ? "\n" : "";
350 public static void doMerges(string action, string ticket_id, string commit_message)
352 GitMonitor.gitmonitor.stop();
356 foreach(var repo in GitRepo.singleton().cache.values) {
357 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
358 var res = repo.doMerge(action,ticket_id, commit_message);
363 commitrevs += commitrevs.length > 0 ? " " : "";
364 commitrevs += repo.currentBranch.lastrev;
367 if (sucess && action == "CLOSE") {
368 RooTicket.singleton().getById(ticket_id).close(commitrevs);
370 GitMonitor.gitmonitor.start();
374 public bool doMerge(string action, string ticket_id, string commit_message)
376 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
377 // also need to decide which branch we will merge into?
379 if (action == "CLOSE" || action == "LEAVE") {
382 var oldbranch = this.currentBranch.name;
383 this.setActiveTicket(null, "master");
384 string [] cmd = { "merge", "--squash", oldbranch };
386 cmd = { "commit", "-a" , "-m", commit_message };
389 this.loadBranches(); // updates lastrev..
391 var notification = new Notify.Notification(
392 "Merged branch %s to master".printf(oldbranch),
398 notification.set_timeout(5);
406 GitMonitor.gitmonitor.pauseError(e.message);
409 // error~?? -- show the error dialog...
412 if (action == "MASTER") {
413 // merge master into ours..
415 string[] cmd = { "merge", "master" };
417 var notification = new Notify.Notification(
418 "Merged code from master to %s".printf(this.currentBranch.name),
423 notification.set_timeout(5);
428 GitMonitor.gitmonitor.pauseError(e.message);
432 if (action == "EXIT") {
434 var oldbranch = this.currentBranch.name;
435 this.setActiveTicket(null, "master");
437 var notification = new Notify.Notification(
438 "Left branch %s".printf(oldbranch),
443 notification.set_timeout(5);
448 GitMonitor.gitmonitor.pauseError(e.message);
452 // error~?? -- show the error dialog...
458 public void loadActiveTicket()
460 this.activeTicket = null;
461 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
465 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
466 if (ticket_id.length < 1) {
469 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
476 public bool setActiveTicket(RooTicket? ticket, string branchname)
478 if (!this.createBranchNamed(branchname)) {
481 if (ticket != null) {
482 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
484 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
486 this.activeTicket = ticket;
490 public bool createBranchNamed(string branchname)
494 if (this.branches.has_key(branchname)) {
495 this.switchToExistingBranchNamed(branchname);
498 this.createNewBranchNamed(branchname);
501 var notification = new Notify.Notification(
502 "Changed to branch %s".printf(branchname),
508 notification.set_timeout(5);
512 this.loadBranches(); // update branch list...
513 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
516 bool switchToExistingBranchNamed(string branchname)
519 // this is where it get's tricky...
522 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
523 files = this.git(cmd);
524 stash = files.length> 1 ;
528 if (stash) { this.git(cmd); }
532 cmd = { "checkout", branchname };
535 GitMonitor.gitmonitor.pauseError(e.message);
539 if (branchname != "master") {
540 string[] cmd = { "merge", "master" };
547 string[] cmd = { "checkout", "master" };
549 GitMonitor.gitmonitor.pauseError(
550 "Use\n\na) git checkout %s\nb) git mergetool\nc) git commit\nd) git push\n d) stash pop \ne) start gitlive again\n".printf(
558 string[] cmd = { "stash", "pop" };
561 var fl = files.split("\n");
562 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
563 foreach(var f in fl) {
564 if (f.length < 1) continue;
573 GitMonitor.gitmonitor.pauseError(ee.message);
583 bool createNewBranchNamed(string branchname)
587 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
588 var files = this.git(cmd);
589 stash = files.length> 1 ;
591 cmd = { "checkout", "-b" , branchname };
594 cmd = { "push", "-u" , "origin" ,"HEAD" };
598 var fl = files.split("\n");
599 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
600 foreach(var f in fl) {
601 if (f.length < 1) continue;
610 GitMonitor.gitmonitor.pauseError(ee.message);
621 * add files to track.
623 * @argument {Array} files the files to add.
625 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
627 // should really find out if these are untracked files each..
628 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
629 // not sure if that is how git works.. but just be certian.
631 for (var i = 0; i < files.size;i++) {
632 var f = files.get(i).vname;
634 string[] cmd = { "add", f };
637 ret += e.message + "\n";
644 public bool is_ignore(string fname) throws Error, SpawnError
646 if (fname == ".gitignore") {
647 this.ignore_files.clear();
650 if (this.ignore_files.has_key(fname)) {
651 return this.ignore_files.get(fname);
655 var ret = this.git( { "check-ignore" , fname } );
656 this.ignore_files.set(fname, ret.length > 0);
657 return ret.length > 0;
658 } catch (SpawnError e) {
659 this.ignore_files.set(fname, false);
668 * remove files to track.
670 * @argument {Array} files the files to add.
672 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
674 // this may fail if files do not exist..
675 // should really find out if these are untracked files each..
676 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
677 // not sure if that is how git works.. but just be certian.
680 for (var i = 0; i < files.size;i++) {
681 var f = files.get(i).vname;
683 string[] cmd = { "rm", "-f" , f };
686 ret += e.message + "\n";
699 * @argument {Object} cfg commit configuration
701 * @property {String} name (optional)
702 * @property {String} email (optional)
703 * @property {String} changed (date) (optional)
704 * @property {String} reason (optional)
705 * @property {Array} files - the files that have changed.
709 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
716 if (typeof(cfg.name) != 'undefined') {
718 'author' : cfg.name + ' <' + cfg.email + '>'
721 "GIT_COMMITTER_NAME" + cfg.name,
722 "GIT_COMMITTER_EMAIL" + cfg.email
726 if (typeof(cfg.changed) != 'undefined') {
727 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
731 string[] args = { "commit", "-m" };
732 args += (message.length > 0 ? message : "Changed" );
733 for (var i = 0; i< files.size ; i++ ) {
734 args += files.get(i).vname; // full path?
737 return this.git(args);
742 * Fetch and merge remote repo changes into current branch..
744 * At present we just need this to update the current working branch..
745 * -- maybe later it will have a few options and do more stuff..
748 public string pull () throws Error, SpawnError
750 // should probably hand error conditions better...
751 string[] cmd = { "pull" , "--no-edit" };
752 return this.git( cmd );
757 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
758 public void pull_async(GitAsyncCallback cb)
761 string[] cmd = { "pull" , "--no-edit" };
762 this.git_async( cmd , cb);
769 * Send local changes to remote repo(s)
771 * At present we just need this to push the current branch.
772 * -- maybe later it will have a few options and do more stuff..
775 public string push () throws Error, SpawnError
778 return this.git({ "push" });
786 * The meaty part.. run spawn.. with git..
791 public string git(string[] args_in ) throws Error, SpawnError
793 // convert arguments.
795 string[] args = { "git" };
796 //args += "--git-dir";
797 //args += this.gitdir;
798 args += "--no-pager";
801 //if (this.gitdir != this.repopath) {
802 // args += "--work-tree";
803 // args += this.repopath;
805 for (var i = 0; i < args_in.length;i++) {
809 //this.lastCmd = args.join(" ");
811 GLib.debug( "CWD=%s", this.git_working_dir );
812 GLib.debug( "cmd: %s", string.joinv (" ", args));
816 string home = "HOME=" + Environment.get_home_dir() ;
818 // do not need to set gitpath..
819 //if (File.exists(this.repo + '/.git/config')) {
820 //env.push("GITPATH=" + this.repo );
823 var cfg = new SpawnConfig(this.git_working_dir , args , env);
826 // may throw error...
827 var sp = new Spawn(cfg);
829 // diff output is a bit big..
830 if (args_in[0] != "diff") {
831 GLib.debug( "GOT: %s" , sp.output);
833 // parse output for some commands ?
837 unowned GitAsyncCallback git_async_on_callback;
838 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
840 // convert arguments.
841 this.git_async_on_callback = cb;
842 string[] args = { "git" };
843 //args += "--git-dir";
844 //args += this.gitdir;
845 args += "--no-pager";
848 //if (this.gitdir != this.repopath) {
849 // args += "--work-tree";
850 // args += this.repopath;
852 for (var i = 0; i < args_in.length;i++) {
856 //this.lastCmd = args.join(" ");
858 GLib.debug( "CWD=%s", this.git_working_dir );
859 //print( "cmd: %s\n", string.joinv (" ", args));
863 string home = "HOME=" + Environment.get_home_dir() ;
865 // do not need to set gitpath..
866 //if (File.exists(this.repo + '/.git/config')) {
867 //env.push("GITPATH=" + this.repo );
871 var cfg = new SpawnConfig(this.git_working_dir , args , env);
875 // may throw error...
876 var sp = new Spawn(cfg);
879 sp.run(this.git_async_on_complete);
883 void git_async_on_complete(int err, string output)
885 GLib.debug("GOT %d : %s", err, output);
886 this.git_async_on_callback(this, err, output);
897 public void update_async(GitAsyncCallback cb)
899 string[] cmd = { "fetch" , "--all" };
900 this.git_async( cmd , cb);
905 static uint update_all_total = 0;
906 static string update_all_after = "";
908 public static void updateAll(string after)
910 update_all_after = after;
911 var tr = GitRepo.singleton().cache;
914 update_all_total = tr.size;
915 foreach(var repo in tr.values) {
916 if (!repo.is_managed()) {
920 repo.update_async(updateAllCallback);
924 public static void updateAllCallback(GitRepo repo, int err, string res)
930 if (update_all_total > 0 ) {
933 switch (update_all_after) {
935 Clones.singleton().show();