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 git_status;
23 public string git_diff;
24 public string ahead_or_behind = "";
26 public Gee.HashMap<string,bool> ignore_files;
27 public GitBranch currentBranch;
28 public Gee.HashMap<string,GitBranch> branches; // accessed in GitBranch..
29 public RooTicket? activeTicket;
30 public Gee.HashMap<string,GitRepo> cache;
34 public static GitRepo singleton()
36 if (_GitRepo == null) {
37 _GitRepo = new GitRepo.single();
38 _GitRepo.cache = new Gee.HashMap<string,GitRepo>();
44 * index of.. matching gitpath..
46 public static int indexOf( Array<GitRepo> repos, string gitpath) {
47 // make a fake object to compare against..
48 var test_repo = GitRepo.get(gitpath);
50 for(var i =0; i < repos.length; i++) {
51 if (repos.index(i).gitdir == test_repo.gitdir) {
63 public static Array<GitRepo> list()
66 //if (GitRepo.list_cache != null) {
67 // unowned Array<GitRepo> ret = GitRepo.list_cache;
70 var cache = GitRepo.singleton().cache;
71 var list_cache = new Array<GitRepo>();
73 var dir = Environment.get_home_dir() + "/gitlive";
75 var f = File.new_for_path(dir);
76 FileEnumerator file_enum;
78 file_enum = f.enumerate_children(
79 FileAttribute.STANDARD_DISPLAY_NAME + ","+
80 FileAttribute.STANDARD_TYPE,
81 FileQueryInfoFlags.NONE,
94 next_file = file_enum.next_file(null);
95 if (next_file == null) {
100 GLib.debug("Error: %s",e.message);
104 //print("got a file " + next_file.sudo () + '?=' + Gio.FileType.DIRECTORY);
106 if (next_file.get_file_type() != FileType.DIRECTORY) {
111 if (next_file.get_file_type() == FileType.SYMBOLIC_LINK) {
116 if (next_file.get_display_name()[0] == '.') {
120 var sp = dir+"/"+next_file.get_display_name();
122 var gitdir = dir + "/" + next_file.get_display_name() + "/.git";
124 if (!FileUtils.test(gitdir, FileTest.IS_DIR)) {
128 var rep = GitRepo.get( sp );
129 list_cache.append_val(rep);
137 public static GitRepo get(string path)
139 var cache = GitRepo.singleton().cache;
140 if (cache.has_key(path)) {
141 return cache.get(path);
143 return new GitRepo(path);
146 private GitRepo.single() {
147 // used to create the signleton
152 * @param {Object} cfg - Configuration
153 * (basically repopath is currently only critical one.)
157 private GitRepo(string path) {
159 this.name = File.new_for_path(path).get_basename();
160 this.ignore_files = new Gee.HashMap<string,bool>();
162 this.git_working_dir = path;
163 this.gitdir = path + "/.git";
164 if (!FileUtils.test(this.gitdir , FileTest.IS_DIR)) {
165 this.gitdir = path; // naked...
167 this.cmds = new Gee.ArrayList<GitMonitorQueue> ();
169 var cache = GitRepo.singleton().cache;
170 //Repo.superclass.constructor.call(this,cfg);
171 if ( !cache.has_key(path) ) {
172 cache.set( path, this);
175 this.loadActiveTicket();
179 public bool is_master_branch()
181 // special branches that do not allow autopushing now...
182 return this.currentBranch.name == "master" || this.currentBranch.name == "roojs";
186 public bool is_managed()
188 // is it a roojs origin?
189 var r = this.git({ "remote" , "get-url" , "--push" , "origin"});
190 var uri = new Soup.URI(r);
191 if (uri.get_host() != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
192 return FileUtils.test(this.gitdir + "/.gitlive-managed" , FileTest.EXISTS);
194 // otherwise see if unmanaged is set to disable it..
195 return !FileUtils.test(this.gitdir + "/.gitlive-unmanaged" , FileTest.EXISTS);
200 public bool is_autocommit ()
202 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
204 public void set_autocommit(bool val)
207 var cur = this.is_autocommit();
208 GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
210 return; // no change..
213 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
216 FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" );
221 public bool is_auto_branch ()
223 if (this.name == "gitlog") {
228 return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
231 public void set_auto_branch(bool val)
234 var cur = this.is_auto_branch();
235 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
238 return; // no change..
241 FileUtils.set_contents(this.gitdir + "/.gitlive-enable-auto-branch" , "x");
244 FileUtils.remove(this.gitdir + "/.gitlive-enable-auto-branch" );
248 public bool is_autopush ()
250 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
252 public void set_autopush(bool val)
255 var cur = this.is_autopush();
256 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
258 return; // no change..
261 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
264 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
270 public void loadStatus()
272 var r = this.git({ "status" , "--porcelain" });
274 this.has_local_changes = r.length > 0;
276 var rs = this.git({ "status" , "-sb" });
278 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
281 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
285 public void loadBranches()
288 GitBranch.loadBranches(this);
294 public string branchesToString()
297 foreach( var br in this.branches.values) {
301 ret += ret.length > 0 ? "\n" : "";
308 public static void doMerges(string action, string ticket_id, string commit_message)
310 GitMonitor.gitmonitor.stop();
314 foreach(var repo in GitRepo.singleton().cache.values) {
315 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
316 var res = repo.doMerge(action,ticket_id, commit_message);
321 commitrevs += commitrevs.length > 0 ? " " : "";
322 commitrevs += repo.currentBranch.lastrev;
325 if (sucess && action == "CLOSE") {
326 RooTicket.singleton().getById(ticket_id).close(commitrevs);
328 GitMonitor.gitmonitor.start();
332 public bool doMerge(string action, string ticket_id, string commit_message)
334 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
335 // also need to decide which branch we will merge into?
337 if (action == "CLOSE" || action == "LEAVE") {
340 var oldbranch = this.currentBranch.name;
341 this.setActiveTicket(null, "master");
342 string [] cmd = { "merge", "--squash", oldbranch };
344 cmd = { "commit", "-a" , "-m", commit_message };
347 this.loadBranches(); // updates lastrev..
349 var notification = new Notify.Notification(
350 "Merged branch %s to master".printf(oldbranch),
356 notification.set_timeout(5);
364 GitMonitor.gitmonitor.pauseError(e.message);
367 // error~?? -- show the error dialog...
370 if (action == "MASTER") {
371 // merge master into ours..
373 string[] cmd = { "merge", "master" };
375 var notification = new Notify.Notification(
376 "Merged code from master to %s".printf(this.currentBranch.name),
381 notification.set_timeout(5);
386 GitMonitor.gitmonitor.pauseError(e.message);
390 if (action == "EXIT") {
392 var oldbranch = this.currentBranch.name;
393 this.setActiveTicket(null, "master");
395 var notification = new Notify.Notification(
396 "Left branch %s".printf(oldbranch),
401 notification.set_timeout(5);
406 GitMonitor.gitmonitor.pauseError(e.message);
410 // error~?? -- show the error dialog...
416 public void loadActiveTicket()
418 this.activeTicket = null;
419 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
423 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
424 if (ticket_id.length < 1) {
427 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
434 public bool setActiveTicket(RooTicket? ticket, string branchname)
436 if (!this.createBranchNamed(branchname)) {
439 if (ticket != null) {
440 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
442 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
444 this.activeTicket = ticket;
448 public bool createBranchNamed(string branchname)
452 if (this.branches.has_key(branchname)) {
453 this.switchToExistingBranchNamed(branchname);
456 this.createNewBranchNamed(branchname);
459 var notification = new Notify.Notification(
460 "Changed to branch %s".printf(branchname),
466 notification.set_timeout(5);
470 this.loadBranches(); // update branch list...
471 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
474 bool switchToExistingBranchNamed(string branchname)
477 // this is where it get's tricky...
480 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
481 files = this.git(cmd);
482 stash = files.length> 1 ;
486 if (stash) { this.git(cmd); }
490 cmd = { "checkout", branchname };
493 GitMonitor.gitmonitor.pauseError(e.message);
497 if (branchname != "master") {
498 string[] cmd = { "merge", "master" };
505 string[] cmd = { "checkout", "master" };
507 GitMonitor.gitmonitor.pauseError(
508 "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(
516 string[] cmd = { "stash", "pop" };
519 var fl = files.split("\n");
520 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
521 foreach(var f in fl) {
522 if (f.length < 1) continue;
531 GitMonitor.gitmonitor.pauseError(ee.message);
541 bool createNewBranchNamed(string branchname)
545 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
546 var files = this.git(cmd);
547 stash = files.length> 1 ;
549 cmd = { "checkout", "-b" , branchname };
552 cmd = { "push", "-u" , "origin" ,"HEAD" };
556 var fl = files.split("\n");
557 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
558 foreach(var f in fl) {
559 if (f.length < 1) continue;
568 GitMonitor.gitmonitor.pauseError(ee.message);
579 * add files to track.
581 * @argument {Array} files the files to add.
583 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
585 // should really find out if these are untracked files each..
586 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
587 // not sure if that is how git works.. but just be certian.
589 for (var i = 0; i < files.size;i++) {
590 var f = files.get(i).vname;
592 string[] cmd = { "add", f };
595 ret += e.message + "\n";
602 public bool is_ignore(string fname) throws Error, SpawnError
604 if (fname == ".gitignore") {
605 this.ignore_files.clear();
608 if (this.ignore_files.has_key(fname)) {
609 return this.ignore_files.get(fname);
613 var ret = this.git( { "check-ignore" , fname } );
614 this.ignore_files.set(fname, ret.length > 0);
615 return ret.length > 0;
616 } catch (SpawnError e) {
617 this.ignore_files.set(fname, false);
626 * remove files to track.
628 * @argument {Array} files the files to add.
630 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
632 // this may fail if files do not exist..
633 // should really find out if these are untracked files each..
634 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
635 // not sure if that is how git works.. but just be certian.
638 for (var i = 0; i < files.size;i++) {
639 var f = files.get(i).vname;
641 string[] cmd = { "rm", "-f" , f };
644 ret += e.message + "\n";
657 * @argument {Object} cfg commit configuration
659 * @property {String} name (optional)
660 * @property {String} email (optional)
661 * @property {String} changed (date) (optional)
662 * @property {String} reason (optional)
663 * @property {Array} files - the files that have changed.
667 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
674 if (typeof(cfg.name) != 'undefined') {
676 'author' : cfg.name + ' <' + cfg.email + '>'
679 "GIT_COMMITTER_NAME" + cfg.name,
680 "GIT_COMMITTER_EMAIL" + cfg.email
684 if (typeof(cfg.changed) != 'undefined') {
685 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
689 string[] args = { "commit", "-m" };
690 args += (message.length > 0 ? message : "Changed" );
691 for (var i = 0; i< files.size ; i++ ) {
692 args += files.get(i).vname; // full path?
695 return this.git(args);
700 * Fetch and merge remote repo changes into current branch..
702 * At present we just need this to update the current working branch..
703 * -- maybe later it will have a few options and do more stuff..
706 public string pull () throws Error, SpawnError
708 // should probably hand error conditions better...
709 string[] cmd = { "pull" , "--no-edit" };
710 return this.git( cmd );
715 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
716 public void pull_async(GitAsyncCallback cb)
719 string[] cmd = { "pull" , "--no-edit" };
720 this.git_async( cmd , cb);
727 * Send local changes to remote repo(s)
729 * At present we just need this to push the current branch.
730 * -- maybe later it will have a few options and do more stuff..
733 public string push () throws Error, SpawnError
736 return this.git({ "push" });
744 * The meaty part.. run spawn.. with git..
749 public string git(string[] args_in ) throws Error, SpawnError
751 // convert arguments.
753 string[] args = { "git" };
754 //args += "--git-dir";
755 //args += this.gitdir;
756 args += "--no-pager";
759 //if (this.gitdir != this.repopath) {
760 // args += "--work-tree";
761 // args += this.repopath;
763 for (var i = 0; i < args_in.length;i++) {
767 //this.lastCmd = args.join(" ");
769 GLib.debug( "CWD=%s", this.git_working_dir );
770 GLib.debug( "cmd: %s", string.joinv (" ", args));
774 string home = "HOME=" + Environment.get_home_dir() ;
776 // do not need to set gitpath..
777 //if (File.exists(this.repo + '/.git/config')) {
778 //env.push("GITPATH=" + this.repo );
781 var cfg = new SpawnConfig(this.git_working_dir , args , env);
784 // may throw error...
785 var sp = new Spawn(cfg);
787 // diff output is a bit big..
788 if (args_in[0] != "diff") {
789 GLib.debug( "GOT: %s" , sp.output);
791 // parse output for some commands ?
795 unowned GitAsyncCallback git_async_on_callback;
796 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
798 // convert arguments.
799 this.git_async_on_callback = cb;
800 string[] args = { "git" };
801 //args += "--git-dir";
802 //args += this.gitdir;
803 args += "--no-pager";
806 //if (this.gitdir != this.repopath) {
807 // args += "--work-tree";
808 // args += this.repopath;
810 for (var i = 0; i < args_in.length;i++) {
814 //this.lastCmd = args.join(" ");
816 GLib.debug( "CWD=%s", this.git_working_dir );
817 //print( "cmd: %s\n", string.joinv (" ", args));
821 string home = "HOME=" + Environment.get_home_dir() ;
823 // do not need to set gitpath..
824 //if (File.exists(this.repo + '/.git/config')) {
825 //env.push("GITPATH=" + this.repo );
829 var cfg = new SpawnConfig(this.git_working_dir , args , env);
833 // may throw error...
834 var sp = new Spawn(cfg);
837 sp.run(this.git_async_on_complete);
841 void git_async_on_complete(int err, string output)
843 GLib.debug("GOT %d : %s", err, output);
844 this.git_async_on_callback(this, err, output);
855 public void update_async(GitAsyncCallback cb)
857 string[] cmd = { "fetch" , "--all" };
858 this.git_async( cmd , cb);
863 static uint update_all_total = 0;
864 static string update_all_after = "";
866 public static void updateAll(string after)
868 update_all_after = after;
869 var tr = GitRepo.singleton().cache;
872 update_all_total = tr.size;
873 foreach(var repo in tr.values) {
874 if (!repo.is_managed()) {
878 repo.update_async(updateAllCallback);
882 public static void updateAllCallback(GitRepo repo, int err, string res)
888 if (update_all_total > 0 ) {
891 switch (update_all_after) {
893 Clones.singleton().show();