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";
193 public bool is_managed()
195 // is it a roojs origin?
197 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
198 return FileUtils.test(this.gitdir + "/.gitlive-managed" , FileTest.EXISTS);
200 // otherwise see if unmanaged is set to disable it..
201 return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS);
206 public bool is_autocommit ()
208 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
210 public void set_autocommit(bool val)
213 var cur = this.is_autocommit();
214 GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
216 return; // no change..
219 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
222 FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" );
227 public bool is_auto_branch ()
229 if (this.name == "gitlog") {
233 if (this.is_managed()) {
241 public void set_auto_branch(bool val)
244 var cur = this.is_auto_branch();
245 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
248 return; // no change..
250 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
251 // remote is not our server..
253 FileUtils.set_contents(this.gitdir + "/.gitlive-managed" , "x");
255 FileUtils.remove(this.gitdir + "/.gitlive-managed" );
262 FileUtils.remove(this.gitdir + "/.gitlive-unmanaged" );
264 FileUtils.set_contents(this.gitdir + "/.gitlive-unmanaged" , "x");
270 public bool is_autopush ()
272 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
274 public void set_autopush(bool val)
277 var cur = this.is_autopush();
278 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
280 return; // no change..
283 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
286 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
292 public void loadStatus()
294 var r = this.git({ "status" , "--porcelain" });
296 this.has_local_changes = r.length > 0;
298 var rs = this.git({ "status" , "-sb" });
300 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
303 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
307 public void loadBranches()
310 GitBranch.loadBranches(this);
316 public string branchesToString()
319 foreach( var br in this.branches.values) {
323 ret += ret.length > 0 ? "\n" : "";
330 public static void doMerges(string action, string ticket_id, string commit_message)
332 GitMonitor.gitmonitor.stop();
336 foreach(var repo in GitRepo.singleton().cache.values) {
337 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
338 var res = repo.doMerge(action,ticket_id, commit_message);
343 commitrevs += commitrevs.length > 0 ? " " : "";
344 commitrevs += repo.currentBranch.lastrev;
347 if (sucess && action == "CLOSE") {
348 RooTicket.singleton().getById(ticket_id).close(commitrevs);
350 GitMonitor.gitmonitor.start();
354 public bool doMerge(string action, string ticket_id, string commit_message)
356 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
357 // also need to decide which branch we will merge into?
359 if (action == "CLOSE" || action == "LEAVE") {
362 var oldbranch = this.currentBranch.name;
363 this.setActiveTicket(null, "master");
364 string [] cmd = { "merge", "--squash", oldbranch };
366 cmd = { "commit", "-a" , "-m", commit_message };
369 this.loadBranches(); // updates lastrev..
371 var notification = new Notify.Notification(
372 "Merged branch %s to master".printf(oldbranch),
378 notification.set_timeout(5);
386 GitMonitor.gitmonitor.pauseError(e.message);
389 // error~?? -- show the error dialog...
392 if (action == "MASTER") {
393 // merge master into ours..
395 string[] cmd = { "merge", "master" };
397 var notification = new Notify.Notification(
398 "Merged code from master to %s".printf(this.currentBranch.name),
403 notification.set_timeout(5);
408 GitMonitor.gitmonitor.pauseError(e.message);
412 if (action == "EXIT") {
414 var oldbranch = this.currentBranch.name;
415 this.setActiveTicket(null, "master");
417 var notification = new Notify.Notification(
418 "Left branch %s".printf(oldbranch),
423 notification.set_timeout(5);
428 GitMonitor.gitmonitor.pauseError(e.message);
432 // error~?? -- show the error dialog...
438 public void loadActiveTicket()
440 this.activeTicket = null;
441 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
445 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
446 if (ticket_id.length < 1) {
449 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
456 public bool setActiveTicket(RooTicket? ticket, string branchname)
458 if (!this.createBranchNamed(branchname)) {
461 if (ticket != null) {
462 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
464 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
466 this.activeTicket = ticket;
470 public bool createBranchNamed(string branchname)
474 if (this.branches.has_key(branchname)) {
475 this.switchToExistingBranchNamed(branchname);
478 this.createNewBranchNamed(branchname);
481 var notification = new Notify.Notification(
482 "Changed to branch %s".printf(branchname),
488 notification.set_timeout(5);
492 this.loadBranches(); // update branch list...
493 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
496 bool switchToExistingBranchNamed(string branchname)
499 // this is where it get's tricky...
502 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
503 files = this.git(cmd);
504 stash = files.length> 1 ;
508 if (stash) { this.git(cmd); }
512 cmd = { "checkout", branchname };
515 GitMonitor.gitmonitor.pauseError(e.message);
519 if (branchname != "master") {
520 string[] cmd = { "merge", "master" };
527 string[] cmd = { "checkout", "master" };
529 GitMonitor.gitmonitor.pauseError(
530 "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(
538 string[] cmd = { "stash", "pop" };
541 var fl = files.split("\n");
542 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
543 foreach(var f in fl) {
544 if (f.length < 1) continue;
553 GitMonitor.gitmonitor.pauseError(ee.message);
563 bool createNewBranchNamed(string branchname)
567 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
568 var files = this.git(cmd);
569 stash = files.length> 1 ;
571 cmd = { "checkout", "-b" , branchname };
574 cmd = { "push", "-u" , "origin" ,"HEAD" };
578 var fl = files.split("\n");
579 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
580 foreach(var f in fl) {
581 if (f.length < 1) continue;
590 GitMonitor.gitmonitor.pauseError(ee.message);
601 * add files to track.
603 * @argument {Array} files the files to add.
605 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
607 // should really find out if these are untracked files each..
608 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
609 // not sure if that is how git works.. but just be certian.
611 for (var i = 0; i < files.size;i++) {
612 var f = files.get(i).vname;
614 string[] cmd = { "add", f };
617 ret += e.message + "\n";
624 public bool is_ignore(string fname) throws Error, SpawnError
626 if (fname == ".gitignore") {
627 this.ignore_files.clear();
630 if (this.ignore_files.has_key(fname)) {
631 return this.ignore_files.get(fname);
635 var ret = this.git( { "check-ignore" , fname } );
636 this.ignore_files.set(fname, ret.length > 0);
637 return ret.length > 0;
638 } catch (SpawnError e) {
639 this.ignore_files.set(fname, false);
648 * remove files to track.
650 * @argument {Array} files the files to add.
652 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
654 // this may fail if files do not exist..
655 // should really find out if these are untracked files each..
656 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
657 // not sure if that is how git works.. but just be certian.
660 for (var i = 0; i < files.size;i++) {
661 var f = files.get(i).vname;
663 string[] cmd = { "rm", "-f" , f };
666 ret += e.message + "\n";
679 * @argument {Object} cfg commit configuration
681 * @property {String} name (optional)
682 * @property {String} email (optional)
683 * @property {String} changed (date) (optional)
684 * @property {String} reason (optional)
685 * @property {Array} files - the files that have changed.
689 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
696 if (typeof(cfg.name) != 'undefined') {
698 'author' : cfg.name + ' <' + cfg.email + '>'
701 "GIT_COMMITTER_NAME" + cfg.name,
702 "GIT_COMMITTER_EMAIL" + cfg.email
706 if (typeof(cfg.changed) != 'undefined') {
707 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
711 string[] args = { "commit", "-m" };
712 args += (message.length > 0 ? message : "Changed" );
713 for (var i = 0; i< files.size ; i++ ) {
714 args += files.get(i).vname; // full path?
717 return this.git(args);
722 * Fetch and merge remote repo changes into current branch..
724 * At present we just need this to update the current working branch..
725 * -- maybe later it will have a few options and do more stuff..
728 public string pull () throws Error, SpawnError
730 // should probably hand error conditions better...
731 string[] cmd = { "pull" , "--no-edit" };
732 return this.git( cmd );
737 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
738 public void pull_async(GitAsyncCallback cb)
741 string[] cmd = { "pull" , "--no-edit" };
742 this.git_async( cmd , cb);
749 * Send local changes to remote repo(s)
751 * At present we just need this to push the current branch.
752 * -- maybe later it will have a few options and do more stuff..
755 public string push () throws Error, SpawnError
758 return this.git({ "push" });
766 * The meaty part.. run spawn.. with git..
771 public string git(string[] args_in ) throws Error, SpawnError
773 // convert arguments.
775 string[] args = { "git" };
776 //args += "--git-dir";
777 //args += this.gitdir;
778 args += "--no-pager";
781 //if (this.gitdir != this.repopath) {
782 // args += "--work-tree";
783 // args += this.repopath;
785 for (var i = 0; i < args_in.length;i++) {
789 //this.lastCmd = args.join(" ");
791 GLib.debug( "CWD=%s", this.git_working_dir );
792 GLib.debug( "cmd: %s", string.joinv (" ", args));
796 string home = "HOME=" + Environment.get_home_dir() ;
798 // do not need to set gitpath..
799 //if (File.exists(this.repo + '/.git/config')) {
800 //env.push("GITPATH=" + this.repo );
803 var cfg = new SpawnConfig(this.git_working_dir , args , env);
806 // may throw error...
807 var sp = new Spawn(cfg);
809 // diff output is a bit big..
810 if (args_in[0] != "diff") {
811 GLib.debug( "GOT: %s" , sp.output);
813 // parse output for some commands ?
817 unowned GitAsyncCallback git_async_on_callback;
818 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
820 // convert arguments.
821 this.git_async_on_callback = cb;
822 string[] args = { "git" };
823 //args += "--git-dir";
824 //args += this.gitdir;
825 args += "--no-pager";
828 //if (this.gitdir != this.repopath) {
829 // args += "--work-tree";
830 // args += this.repopath;
832 for (var i = 0; i < args_in.length;i++) {
836 //this.lastCmd = args.join(" ");
838 GLib.debug( "CWD=%s", this.git_working_dir );
839 //print( "cmd: %s\n", string.joinv (" ", args));
843 string home = "HOME=" + Environment.get_home_dir() ;
845 // do not need to set gitpath..
846 //if (File.exists(this.repo + '/.git/config')) {
847 //env.push("GITPATH=" + this.repo );
851 var cfg = new SpawnConfig(this.git_working_dir , args , env);
855 // may throw error...
856 var sp = new Spawn(cfg);
859 sp.run(this.git_async_on_complete);
863 void git_async_on_complete(int err, string output)
865 GLib.debug("GOT %d : %s", err, output);
866 this.git_async_on_callback(this, err, output);
877 public void update_async(GitAsyncCallback cb)
879 string[] cmd = { "fetch" , "--all" };
880 this.git_async( cmd , cb);
885 static uint update_all_total = 0;
886 static string update_all_after = "";
888 public static void updateAll(string after)
890 update_all_after = after;
891 var tr = GitRepo.singleton().cache;
894 update_all_total = tr.size;
895 foreach(var repo in tr.values) {
896 if (!repo.is_managed()) {
900 repo.update_async(updateAllCallback);
904 public static void updateAllCallback(GitRepo repo, int err, string res)
910 if (update_all_total > 0 ) {
913 switch (update_all_after) {
915 Clones.singleton().show();