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 string get_config(string key) {
194 return this.git({ "config" , "gitlive." + key);
196 public string set_config(string key, string value) {
197 return this.git({ "config" , "gitlive." + key, value);
200 public bool is_managed()
202 // is it a roojs origin?
204 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
205 var r = this.git({ "config" , "gitlive.managed");
207 return FileUtils.test(this.gitdir + "/.gitlive-managed" , FileTest.EXISTS);
209 // otherwise see if unmanaged is set to disable it..
210 return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS);
215 public bool is_autocommit ()
217 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
219 public void set_autocommit(bool val)
222 var cur = this.is_autocommit();
223 GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
225 return; // no change..
228 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
231 FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" );
236 public bool is_auto_branch ()
238 if (this.name == "gitlog") {
242 if (this.is_managed()) {
250 public void set_auto_branch(bool val)
253 var cur = this.is_auto_branch();
254 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
257 return; // no change..
259 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
260 // remote is not our server..
262 FileUtils.set_contents(this.gitdir + "/.gitlive-managed" , "x");
264 FileUtils.remove(this.gitdir + "/.gitlive-managed" );
271 FileUtils.remove(this.gitdir + "/.gitlive-unmanaged" );
273 FileUtils.set_contents(this.gitdir + "/.gitlive-unmanaged" , "x");
279 public bool is_autopush ()
281 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
283 public void set_autopush(bool val)
286 var cur = this.is_autopush();
287 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
289 return; // no change..
292 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
295 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
301 public void loadStatus()
303 var r = this.git({ "status" , "--porcelain" });
305 this.has_local_changes = r.length > 0;
307 var rs = this.git({ "status" , "-sb" });
309 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
312 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
316 public void loadBranches()
319 GitBranch.loadBranches(this);
325 public string branchesToString()
328 foreach( var br in this.branches.values) {
332 ret += ret.length > 0 ? "\n" : "";
339 public static void doMerges(string action, string ticket_id, string commit_message)
341 GitMonitor.gitmonitor.stop();
345 foreach(var repo in GitRepo.singleton().cache.values) {
346 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
347 var res = repo.doMerge(action,ticket_id, commit_message);
352 commitrevs += commitrevs.length > 0 ? " " : "";
353 commitrevs += repo.currentBranch.lastrev;
356 if (sucess && action == "CLOSE") {
357 RooTicket.singleton().getById(ticket_id).close(commitrevs);
359 GitMonitor.gitmonitor.start();
363 public bool doMerge(string action, string ticket_id, string commit_message)
365 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
366 // also need to decide which branch we will merge into?
368 if (action == "CLOSE" || action == "LEAVE") {
371 var oldbranch = this.currentBranch.name;
372 this.setActiveTicket(null, "master");
373 string [] cmd = { "merge", "--squash", oldbranch };
375 cmd = { "commit", "-a" , "-m", commit_message };
378 this.loadBranches(); // updates lastrev..
380 var notification = new Notify.Notification(
381 "Merged branch %s to master".printf(oldbranch),
387 notification.set_timeout(5);
395 GitMonitor.gitmonitor.pauseError(e.message);
398 // error~?? -- show the error dialog...
401 if (action == "MASTER") {
402 // merge master into ours..
404 string[] cmd = { "merge", "master" };
406 var notification = new Notify.Notification(
407 "Merged code from master to %s".printf(this.currentBranch.name),
412 notification.set_timeout(5);
417 GitMonitor.gitmonitor.pauseError(e.message);
421 if (action == "EXIT") {
423 var oldbranch = this.currentBranch.name;
424 this.setActiveTicket(null, "master");
426 var notification = new Notify.Notification(
427 "Left branch %s".printf(oldbranch),
432 notification.set_timeout(5);
437 GitMonitor.gitmonitor.pauseError(e.message);
441 // error~?? -- show the error dialog...
447 public void loadActiveTicket()
449 this.activeTicket = null;
450 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
454 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
455 if (ticket_id.length < 1) {
458 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
465 public bool setActiveTicket(RooTicket? ticket, string branchname)
467 if (!this.createBranchNamed(branchname)) {
470 if (ticket != null) {
471 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
473 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
475 this.activeTicket = ticket;
479 public bool createBranchNamed(string branchname)
483 if (this.branches.has_key(branchname)) {
484 this.switchToExistingBranchNamed(branchname);
487 this.createNewBranchNamed(branchname);
490 var notification = new Notify.Notification(
491 "Changed to branch %s".printf(branchname),
497 notification.set_timeout(5);
501 this.loadBranches(); // update branch list...
502 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
505 bool switchToExistingBranchNamed(string branchname)
508 // this is where it get's tricky...
511 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
512 files = this.git(cmd);
513 stash = files.length> 1 ;
517 if (stash) { this.git(cmd); }
521 cmd = { "checkout", branchname };
524 GitMonitor.gitmonitor.pauseError(e.message);
528 if (branchname != "master") {
529 string[] cmd = { "merge", "master" };
536 string[] cmd = { "checkout", "master" };
538 GitMonitor.gitmonitor.pauseError(
539 "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(
547 string[] cmd = { "stash", "pop" };
550 var fl = files.split("\n");
551 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
552 foreach(var f in fl) {
553 if (f.length < 1) continue;
562 GitMonitor.gitmonitor.pauseError(ee.message);
572 bool createNewBranchNamed(string branchname)
576 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
577 var files = this.git(cmd);
578 stash = files.length> 1 ;
580 cmd = { "checkout", "-b" , branchname };
583 cmd = { "push", "-u" , "origin" ,"HEAD" };
587 var fl = files.split("\n");
588 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
589 foreach(var f in fl) {
590 if (f.length < 1) continue;
599 GitMonitor.gitmonitor.pauseError(ee.message);
610 * add files to track.
612 * @argument {Array} files the files to add.
614 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
616 // should really find out if these are untracked files each..
617 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
618 // not sure if that is how git works.. but just be certian.
620 for (var i = 0; i < files.size;i++) {
621 var f = files.get(i).vname;
623 string[] cmd = { "add", f };
626 ret += e.message + "\n";
633 public bool is_ignore(string fname) throws Error, SpawnError
635 if (fname == ".gitignore") {
636 this.ignore_files.clear();
639 if (this.ignore_files.has_key(fname)) {
640 return this.ignore_files.get(fname);
644 var ret = this.git( { "check-ignore" , fname } );
645 this.ignore_files.set(fname, ret.length > 0);
646 return ret.length > 0;
647 } catch (SpawnError e) {
648 this.ignore_files.set(fname, false);
657 * remove files to track.
659 * @argument {Array} files the files to add.
661 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
663 // this may fail if files do not exist..
664 // should really find out if these are untracked files each..
665 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
666 // not sure if that is how git works.. but just be certian.
669 for (var i = 0; i < files.size;i++) {
670 var f = files.get(i).vname;
672 string[] cmd = { "rm", "-f" , f };
675 ret += e.message + "\n";
688 * @argument {Object} cfg commit configuration
690 * @property {String} name (optional)
691 * @property {String} email (optional)
692 * @property {String} changed (date) (optional)
693 * @property {String} reason (optional)
694 * @property {Array} files - the files that have changed.
698 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
705 if (typeof(cfg.name) != 'undefined') {
707 'author' : cfg.name + ' <' + cfg.email + '>'
710 "GIT_COMMITTER_NAME" + cfg.name,
711 "GIT_COMMITTER_EMAIL" + cfg.email
715 if (typeof(cfg.changed) != 'undefined') {
716 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
720 string[] args = { "commit", "-m" };
721 args += (message.length > 0 ? message : "Changed" );
722 for (var i = 0; i< files.size ; i++ ) {
723 args += files.get(i).vname; // full path?
726 return this.git(args);
731 * Fetch and merge remote repo changes into current branch..
733 * At present we just need this to update the current working branch..
734 * -- maybe later it will have a few options and do more stuff..
737 public string pull () throws Error, SpawnError
739 // should probably hand error conditions better...
740 string[] cmd = { "pull" , "--no-edit" };
741 return this.git( cmd );
746 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
747 public void pull_async(GitAsyncCallback cb)
750 string[] cmd = { "pull" , "--no-edit" };
751 this.git_async( cmd , cb);
758 * Send local changes to remote repo(s)
760 * At present we just need this to push the current branch.
761 * -- maybe later it will have a few options and do more stuff..
764 public string push () throws Error, SpawnError
767 return this.git({ "push" });
775 * The meaty part.. run spawn.. with git..
780 public string git(string[] args_in ) throws Error, SpawnError
782 // convert arguments.
784 string[] args = { "git" };
785 //args += "--git-dir";
786 //args += this.gitdir;
787 args += "--no-pager";
790 //if (this.gitdir != this.repopath) {
791 // args += "--work-tree";
792 // args += this.repopath;
794 for (var i = 0; i < args_in.length;i++) {
798 //this.lastCmd = args.join(" ");
800 GLib.debug( "CWD=%s", this.git_working_dir );
801 GLib.debug( "cmd: %s", string.joinv (" ", args));
805 string home = "HOME=" + Environment.get_home_dir() ;
807 // do not need to set gitpath..
808 //if (File.exists(this.repo + '/.git/config')) {
809 //env.push("GITPATH=" + this.repo );
812 var cfg = new SpawnConfig(this.git_working_dir , args , env);
815 // may throw error...
816 var sp = new Spawn(cfg);
818 // diff output is a bit big..
819 if (args_in[0] != "diff") {
820 GLib.debug( "GOT: %s" , sp.output);
822 // parse output for some commands ?
826 unowned GitAsyncCallback git_async_on_callback;
827 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
829 // convert arguments.
830 this.git_async_on_callback = cb;
831 string[] args = { "git" };
832 //args += "--git-dir";
833 //args += this.gitdir;
834 args += "--no-pager";
837 //if (this.gitdir != this.repopath) {
838 // args += "--work-tree";
839 // args += this.repopath;
841 for (var i = 0; i < args_in.length;i++) {
845 //this.lastCmd = args.join(" ");
847 GLib.debug( "CWD=%s", this.git_working_dir );
848 //print( "cmd: %s\n", string.joinv (" ", args));
852 string home = "HOME=" + Environment.get_home_dir() ;
854 // do not need to set gitpath..
855 //if (File.exists(this.repo + '/.git/config')) {
856 //env.push("GITPATH=" + this.repo );
860 var cfg = new SpawnConfig(this.git_working_dir , args , env);
864 // may throw error...
865 var sp = new Spawn(cfg);
868 sp.run(this.git_async_on_complete);
872 void git_async_on_complete(int err, string output)
874 GLib.debug("GOT %d : %s", err, output);
875 this.git_async_on_callback(this, err, output);
886 public void update_async(GitAsyncCallback cb)
888 string[] cmd = { "fetch" , "--all" };
889 this.git_async( cmd , cb);
894 static uint update_all_total = 0;
895 static string update_all_after = "";
897 public static void updateAll(string after)
899 update_all_after = after;
900 var tr = GitRepo.singleton().cache;
903 update_all_total = tr.size;
904 foreach(var repo in tr.values) {
905 if (!repo.is_managed()) {
909 repo.update_async(updateAllCallback);
913 public static void updateAllCallback(GitRepo repo, int err, string res)
919 if (update_all_total > 0 ) {
922 switch (update_all_after) {
924 Clones.singleton().show();