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");
198 if (this.get_config("autocommit") == "") {
199 this.set_config("autocommit", this.host == "git.roojs.com" ? "1" : "0");
206 public string get_config(string key) {
207 return this.git({ "config" , "gitlive." + key });
209 public string set_config(string key, string value) {
210 return this.git({ "config" , "gitlive." + key, value });
213 public bool is_managed()
215 return this.get_config("managed") == "1";
219 public bool is_autocommit ()
221 return this.get_config("autocommit") == "1";
224 public void set_autocommit(bool val)
226 this.set_config("autocommit", val ? "1" : "0");
230 public bool is_auto_branch ()
232 if (this.name == "gitlog") {
236 if (this.is_managed()) {
244 public void set_auto_branch(bool val)
247 var cur = this.is_auto_branch();
248 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
251 return; // no change..
253 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
254 // remote is not our server..
256 FileUtils.set_contents(this.gitdir + "/.gitlive-managed" , "x");
258 FileUtils.remove(this.gitdir + "/.gitlive-managed" );
265 FileUtils.remove(this.gitdir + "/.gitlive-unmanaged" );
267 FileUtils.set_contents(this.gitdir + "/.gitlive-unmanaged" , "x");
273 public bool is_autopush ()
275 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
277 public void set_autopush(bool val)
280 var cur = this.is_autopush();
281 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
283 return; // no change..
286 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
289 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
295 public void loadStatus()
297 var r = this.git({ "status" , "--porcelain" });
299 this.has_local_changes = r.length > 0;
301 var rs = this.git({ "status" , "-sb" });
303 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
306 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
310 public void loadBranches()
313 GitBranch.loadBranches(this);
319 public string branchesToString()
322 foreach( var br in this.branches.values) {
326 ret += ret.length > 0 ? "\n" : "";
333 public static void doMerges(string action, string ticket_id, string commit_message)
335 GitMonitor.gitmonitor.stop();
339 foreach(var repo in GitRepo.singleton().cache.values) {
340 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
341 var res = repo.doMerge(action,ticket_id, commit_message);
346 commitrevs += commitrevs.length > 0 ? " " : "";
347 commitrevs += repo.currentBranch.lastrev;
350 if (sucess && action == "CLOSE") {
351 RooTicket.singleton().getById(ticket_id).close(commitrevs);
353 GitMonitor.gitmonitor.start();
357 public bool doMerge(string action, string ticket_id, string commit_message)
359 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
360 // also need to decide which branch we will merge into?
362 if (action == "CLOSE" || action == "LEAVE") {
365 var oldbranch = this.currentBranch.name;
366 this.setActiveTicket(null, "master");
367 string [] cmd = { "merge", "--squash", oldbranch };
369 cmd = { "commit", "-a" , "-m", commit_message };
372 this.loadBranches(); // updates lastrev..
374 var notification = new Notify.Notification(
375 "Merged branch %s to master".printf(oldbranch),
381 notification.set_timeout(5);
389 GitMonitor.gitmonitor.pauseError(e.message);
392 // error~?? -- show the error dialog...
395 if (action == "MASTER") {
396 // merge master into ours..
398 string[] cmd = { "merge", "master" };
400 var notification = new Notify.Notification(
401 "Merged code from master to %s".printf(this.currentBranch.name),
406 notification.set_timeout(5);
411 GitMonitor.gitmonitor.pauseError(e.message);
415 if (action == "EXIT") {
417 var oldbranch = this.currentBranch.name;
418 this.setActiveTicket(null, "master");
420 var notification = new Notify.Notification(
421 "Left branch %s".printf(oldbranch),
426 notification.set_timeout(5);
431 GitMonitor.gitmonitor.pauseError(e.message);
435 // error~?? -- show the error dialog...
441 public void loadActiveTicket()
443 this.activeTicket = null;
444 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
448 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
449 if (ticket_id.length < 1) {
452 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
459 public bool setActiveTicket(RooTicket? ticket, string branchname)
461 if (!this.createBranchNamed(branchname)) {
464 if (ticket != null) {
465 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
467 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
469 this.activeTicket = ticket;
473 public bool createBranchNamed(string branchname)
477 if (this.branches.has_key(branchname)) {
478 this.switchToExistingBranchNamed(branchname);
481 this.createNewBranchNamed(branchname);
484 var notification = new Notify.Notification(
485 "Changed to branch %s".printf(branchname),
491 notification.set_timeout(5);
495 this.loadBranches(); // update branch list...
496 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
499 bool switchToExistingBranchNamed(string branchname)
502 // this is where it get's tricky...
505 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
506 files = this.git(cmd);
507 stash = files.length> 1 ;
511 if (stash) { this.git(cmd); }
515 cmd = { "checkout", branchname };
518 GitMonitor.gitmonitor.pauseError(e.message);
522 if (branchname != "master") {
523 string[] cmd = { "merge", "master" };
530 string[] cmd = { "checkout", "master" };
532 GitMonitor.gitmonitor.pauseError(
533 "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(
541 string[] cmd = { "stash", "pop" };
544 var fl = files.split("\n");
545 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
546 foreach(var f in fl) {
547 if (f.length < 1) continue;
556 GitMonitor.gitmonitor.pauseError(ee.message);
566 bool createNewBranchNamed(string branchname)
570 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
571 var files = this.git(cmd);
572 stash = files.length> 1 ;
574 cmd = { "checkout", "-b" , branchname };
577 cmd = { "push", "-u" , "origin" ,"HEAD" };
581 var fl = files.split("\n");
582 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
583 foreach(var f in fl) {
584 if (f.length < 1) continue;
593 GitMonitor.gitmonitor.pauseError(ee.message);
604 * add files to track.
606 * @argument {Array} files the files to add.
608 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
610 // should really find out if these are untracked files each..
611 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
612 // not sure if that is how git works.. but just be certian.
614 for (var i = 0; i < files.size;i++) {
615 var f = files.get(i).vname;
617 string[] cmd = { "add", f };
620 ret += e.message + "\n";
627 public bool is_ignore(string fname) throws Error, SpawnError
629 if (fname == ".gitignore") {
630 this.ignore_files.clear();
633 if (this.ignore_files.has_key(fname)) {
634 return this.ignore_files.get(fname);
638 var ret = this.git( { "check-ignore" , fname } );
639 this.ignore_files.set(fname, ret.length > 0);
640 return ret.length > 0;
641 } catch (SpawnError e) {
642 this.ignore_files.set(fname, false);
651 * remove files to track.
653 * @argument {Array} files the files to add.
655 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
657 // this may fail if files do not exist..
658 // should really find out if these are untracked files each..
659 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
660 // not sure if that is how git works.. but just be certian.
663 for (var i = 0; i < files.size;i++) {
664 var f = files.get(i).vname;
666 string[] cmd = { "rm", "-f" , f };
669 ret += e.message + "\n";
682 * @argument {Object} cfg commit configuration
684 * @property {String} name (optional)
685 * @property {String} email (optional)
686 * @property {String} changed (date) (optional)
687 * @property {String} reason (optional)
688 * @property {Array} files - the files that have changed.
692 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
699 if (typeof(cfg.name) != 'undefined') {
701 'author' : cfg.name + ' <' + cfg.email + '>'
704 "GIT_COMMITTER_NAME" + cfg.name,
705 "GIT_COMMITTER_EMAIL" + cfg.email
709 if (typeof(cfg.changed) != 'undefined') {
710 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
714 string[] args = { "commit", "-m" };
715 args += (message.length > 0 ? message : "Changed" );
716 for (var i = 0; i< files.size ; i++ ) {
717 args += files.get(i).vname; // full path?
720 return this.git(args);
725 * Fetch and merge remote repo changes into current branch..
727 * At present we just need this to update the current working branch..
728 * -- maybe later it will have a few options and do more stuff..
731 public string pull () throws Error, SpawnError
733 // should probably hand error conditions better...
734 string[] cmd = { "pull" , "--no-edit" };
735 return this.git( cmd );
740 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
741 public void pull_async(GitAsyncCallback cb)
744 string[] cmd = { "pull" , "--no-edit" };
745 this.git_async( cmd , cb);
752 * Send local changes to remote repo(s)
754 * At present we just need this to push the current branch.
755 * -- maybe later it will have a few options and do more stuff..
758 public string push () throws Error, SpawnError
761 return this.git({ "push" });
769 * The meaty part.. run spawn.. with git..
774 public string git(string[] args_in ) throws Error, SpawnError
776 // convert arguments.
778 string[] args = { "git" };
779 //args += "--git-dir";
780 //args += this.gitdir;
781 args += "--no-pager";
784 //if (this.gitdir != this.repopath) {
785 // args += "--work-tree";
786 // args += this.repopath;
788 for (var i = 0; i < args_in.length;i++) {
792 //this.lastCmd = args.join(" ");
794 GLib.debug( "CWD=%s", this.git_working_dir );
795 GLib.debug( "cmd: %s", string.joinv (" ", args));
799 string home = "HOME=" + Environment.get_home_dir() ;
801 // do not need to set gitpath..
802 //if (File.exists(this.repo + '/.git/config')) {
803 //env.push("GITPATH=" + this.repo );
806 var cfg = new SpawnConfig(this.git_working_dir , args , env);
809 // may throw error...
810 var sp = new Spawn(cfg);
812 // diff output is a bit big..
813 if (args_in[0] != "diff") {
814 GLib.debug( "GOT: %s" , sp.output);
816 // parse output for some commands ?
820 unowned GitAsyncCallback git_async_on_callback;
821 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
823 // convert arguments.
824 this.git_async_on_callback = cb;
825 string[] args = { "git" };
826 //args += "--git-dir";
827 //args += this.gitdir;
828 args += "--no-pager";
831 //if (this.gitdir != this.repopath) {
832 // args += "--work-tree";
833 // args += this.repopath;
835 for (var i = 0; i < args_in.length;i++) {
839 //this.lastCmd = args.join(" ");
841 GLib.debug( "CWD=%s", this.git_working_dir );
842 //print( "cmd: %s\n", string.joinv (" ", args));
846 string home = "HOME=" + Environment.get_home_dir() ;
848 // do not need to set gitpath..
849 //if (File.exists(this.repo + '/.git/config')) {
850 //env.push("GITPATH=" + this.repo );
854 var cfg = new SpawnConfig(this.git_working_dir , args , env);
858 // may throw error...
859 var sp = new Spawn(cfg);
862 sp.run(this.git_async_on_complete);
866 void git_async_on_complete(int err, string output)
868 GLib.debug("GOT %d : %s", err, output);
869 this.git_async_on_callback(this, err, output);
880 public void update_async(GitAsyncCallback cb)
882 string[] cmd = { "fetch" , "--all" };
883 this.git_async( cmd , cb);
888 static uint update_all_total = 0;
889 static string update_all_after = "";
891 public static void updateAll(string after)
893 update_all_after = after;
894 var tr = GitRepo.singleton().cache;
897 update_all_total = tr.size;
898 foreach(var repo in tr.values) {
899 if (!repo.is_managed()) {
903 repo.update_async(updateAllCallback);
907 public static void updateAllCallback(GitRepo repo, int err, string res)
913 if (update_all_total > 0 ) {
916 switch (update_all_after) {
918 Clones.singleton().show();