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" );
260 // otherwise see if unmanaged is set to disable it..
261 return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS);
265 FileUtils.set_contents(this.gitdir + "/.gitlive-enable-auto-branch" , "x");
268 FileUtils.remove(this.gitdir + "/.gitlive-enable-auto-branch" );
272 public bool is_autopush ()
274 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
276 public void set_autopush(bool val)
279 var cur = this.is_autopush();
280 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
282 return; // no change..
285 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
288 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
294 public void loadStatus()
296 var r = this.git({ "status" , "--porcelain" });
298 this.has_local_changes = r.length > 0;
300 var rs = this.git({ "status" , "-sb" });
302 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
305 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
309 public void loadBranches()
312 GitBranch.loadBranches(this);
318 public string branchesToString()
321 foreach( var br in this.branches.values) {
325 ret += ret.length > 0 ? "\n" : "";
332 public static void doMerges(string action, string ticket_id, string commit_message)
334 GitMonitor.gitmonitor.stop();
338 foreach(var repo in GitRepo.singleton().cache.values) {
339 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
340 var res = repo.doMerge(action,ticket_id, commit_message);
345 commitrevs += commitrevs.length > 0 ? " " : "";
346 commitrevs += repo.currentBranch.lastrev;
349 if (sucess && action == "CLOSE") {
350 RooTicket.singleton().getById(ticket_id).close(commitrevs);
352 GitMonitor.gitmonitor.start();
356 public bool doMerge(string action, string ticket_id, string commit_message)
358 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
359 // also need to decide which branch we will merge into?
361 if (action == "CLOSE" || action == "LEAVE") {
364 var oldbranch = this.currentBranch.name;
365 this.setActiveTicket(null, "master");
366 string [] cmd = { "merge", "--squash", oldbranch };
368 cmd = { "commit", "-a" , "-m", commit_message };
371 this.loadBranches(); // updates lastrev..
373 var notification = new Notify.Notification(
374 "Merged branch %s to master".printf(oldbranch),
380 notification.set_timeout(5);
388 GitMonitor.gitmonitor.pauseError(e.message);
391 // error~?? -- show the error dialog...
394 if (action == "MASTER") {
395 // merge master into ours..
397 string[] cmd = { "merge", "master" };
399 var notification = new Notify.Notification(
400 "Merged code from master to %s".printf(this.currentBranch.name),
405 notification.set_timeout(5);
410 GitMonitor.gitmonitor.pauseError(e.message);
414 if (action == "EXIT") {
416 var oldbranch = this.currentBranch.name;
417 this.setActiveTicket(null, "master");
419 var notification = new Notify.Notification(
420 "Left branch %s".printf(oldbranch),
425 notification.set_timeout(5);
430 GitMonitor.gitmonitor.pauseError(e.message);
434 // error~?? -- show the error dialog...
440 public void loadActiveTicket()
442 this.activeTicket = null;
443 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
447 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
448 if (ticket_id.length < 1) {
451 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
458 public bool setActiveTicket(RooTicket? ticket, string branchname)
460 if (!this.createBranchNamed(branchname)) {
463 if (ticket != null) {
464 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
466 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
468 this.activeTicket = ticket;
472 public bool createBranchNamed(string branchname)
476 if (this.branches.has_key(branchname)) {
477 this.switchToExistingBranchNamed(branchname);
480 this.createNewBranchNamed(branchname);
483 var notification = new Notify.Notification(
484 "Changed to branch %s".printf(branchname),
490 notification.set_timeout(5);
494 this.loadBranches(); // update branch list...
495 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
498 bool switchToExistingBranchNamed(string branchname)
501 // this is where it get's tricky...
504 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
505 files = this.git(cmd);
506 stash = files.length> 1 ;
510 if (stash) { this.git(cmd); }
514 cmd = { "checkout", branchname };
517 GitMonitor.gitmonitor.pauseError(e.message);
521 if (branchname != "master") {
522 string[] cmd = { "merge", "master" };
529 string[] cmd = { "checkout", "master" };
531 GitMonitor.gitmonitor.pauseError(
532 "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(
540 string[] cmd = { "stash", "pop" };
543 var fl = files.split("\n");
544 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
545 foreach(var f in fl) {
546 if (f.length < 1) continue;
555 GitMonitor.gitmonitor.pauseError(ee.message);
565 bool createNewBranchNamed(string branchname)
569 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
570 var files = this.git(cmd);
571 stash = files.length> 1 ;
573 cmd = { "checkout", "-b" , branchname };
576 cmd = { "push", "-u" , "origin" ,"HEAD" };
580 var fl = files.split("\n");
581 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
582 foreach(var f in fl) {
583 if (f.length < 1) continue;
592 GitMonitor.gitmonitor.pauseError(ee.message);
603 * add files to track.
605 * @argument {Array} files the files to add.
607 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
609 // should really find out if these are untracked files each..
610 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
611 // not sure if that is how git works.. but just be certian.
613 for (var i = 0; i < files.size;i++) {
614 var f = files.get(i).vname;
616 string[] cmd = { "add", f };
619 ret += e.message + "\n";
626 public bool is_ignore(string fname) throws Error, SpawnError
628 if (fname == ".gitignore") {
629 this.ignore_files.clear();
632 if (this.ignore_files.has_key(fname)) {
633 return this.ignore_files.get(fname);
637 var ret = this.git( { "check-ignore" , fname } );
638 this.ignore_files.set(fname, ret.length > 0);
639 return ret.length > 0;
640 } catch (SpawnError e) {
641 this.ignore_files.set(fname, false);
650 * remove files to track.
652 * @argument {Array} files the files to add.
654 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
656 // this may fail if files do not exist..
657 // should really find out if these are untracked files each..
658 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
659 // not sure if that is how git works.. but just be certian.
662 for (var i = 0; i < files.size;i++) {
663 var f = files.get(i).vname;
665 string[] cmd = { "rm", "-f" , f };
668 ret += e.message + "\n";
681 * @argument {Object} cfg commit configuration
683 * @property {String} name (optional)
684 * @property {String} email (optional)
685 * @property {String} changed (date) (optional)
686 * @property {String} reason (optional)
687 * @property {Array} files - the files that have changed.
691 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
698 if (typeof(cfg.name) != 'undefined') {
700 'author' : cfg.name + ' <' + cfg.email + '>'
703 "GIT_COMMITTER_NAME" + cfg.name,
704 "GIT_COMMITTER_EMAIL" + cfg.email
708 if (typeof(cfg.changed) != 'undefined') {
709 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
713 string[] args = { "commit", "-m" };
714 args += (message.length > 0 ? message : "Changed" );
715 for (var i = 0; i< files.size ; i++ ) {
716 args += files.get(i).vname; // full path?
719 return this.git(args);
724 * Fetch and merge remote repo changes into current branch..
726 * At present we just need this to update the current working branch..
727 * -- maybe later it will have a few options and do more stuff..
730 public string pull () throws Error, SpawnError
732 // should probably hand error conditions better...
733 string[] cmd = { "pull" , "--no-edit" };
734 return this.git( cmd );
739 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
740 public void pull_async(GitAsyncCallback cb)
743 string[] cmd = { "pull" , "--no-edit" };
744 this.git_async( cmd , cb);
751 * Send local changes to remote repo(s)
753 * At present we just need this to push the current branch.
754 * -- maybe later it will have a few options and do more stuff..
757 public string push () throws Error, SpawnError
760 return this.git({ "push" });
768 * The meaty part.. run spawn.. with git..
773 public string git(string[] args_in ) throws Error, SpawnError
775 // convert arguments.
777 string[] args = { "git" };
778 //args += "--git-dir";
779 //args += this.gitdir;
780 args += "--no-pager";
783 //if (this.gitdir != this.repopath) {
784 // args += "--work-tree";
785 // args += this.repopath;
787 for (var i = 0; i < args_in.length;i++) {
791 //this.lastCmd = args.join(" ");
793 GLib.debug( "CWD=%s", this.git_working_dir );
794 GLib.debug( "cmd: %s", string.joinv (" ", args));
798 string home = "HOME=" + Environment.get_home_dir() ;
800 // do not need to set gitpath..
801 //if (File.exists(this.repo + '/.git/config')) {
802 //env.push("GITPATH=" + this.repo );
805 var cfg = new SpawnConfig(this.git_working_dir , args , env);
808 // may throw error...
809 var sp = new Spawn(cfg);
811 // diff output is a bit big..
812 if (args_in[0] != "diff") {
813 GLib.debug( "GOT: %s" , sp.output);
815 // parse output for some commands ?
819 unowned GitAsyncCallback git_async_on_callback;
820 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
822 // convert arguments.
823 this.git_async_on_callback = cb;
824 string[] args = { "git" };
825 //args += "--git-dir";
826 //args += this.gitdir;
827 args += "--no-pager";
830 //if (this.gitdir != this.repopath) {
831 // args += "--work-tree";
832 // args += this.repopath;
834 for (var i = 0; i < args_in.length;i++) {
838 //this.lastCmd = args.join(" ");
840 GLib.debug( "CWD=%s", this.git_working_dir );
841 //print( "cmd: %s\n", string.joinv (" ", args));
845 string home = "HOME=" + Environment.get_home_dir() ;
847 // do not need to set gitpath..
848 //if (File.exists(this.repo + '/.git/config')) {
849 //env.push("GITPATH=" + this.repo );
853 var cfg = new SpawnConfig(this.git_working_dir , args , env);
857 // may throw error...
858 var sp = new Spawn(cfg);
861 sp.run(this.git_async_on_complete);
865 void git_async_on_complete(int err, string output)
867 GLib.debug("GOT %d : %s", err, output);
868 this.git_async_on_callback(this, err, output);
879 public void update_async(GitAsyncCallback cb)
881 string[] cmd = { "fetch" , "--all" };
882 this.git_async( cmd , cb);
887 static uint update_all_total = 0;
888 static string update_all_after = "";
890 public static void updateAll(string after)
892 update_all_after = after;
893 var tr = GitRepo.singleton().cache;
896 update_all_total = tr.size;
897 foreach(var repo in tr.values) {
898 if (!repo.is_managed()) {
902 repo.update_async(updateAllCallback);
906 public static void updateAllCallback(GitRepo repo, int err, string res)
912 if (update_all_total > 0 ) {
915 switch (update_all_after) {
917 Clones.singleton().show();