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") {
227 if (this.is_managed()) {
232 return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
235 public void set_auto_branch(bool val)
238 var cur = this.is_auto_branch();
239 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
242 return; // no change..
245 FileUtils.set_contents(this.gitdir + "/.gitlive-enable-auto-branch" , "x");
248 FileUtils.remove(this.gitdir + "/.gitlive-enable-auto-branch" );
252 public bool is_autopush ()
254 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
256 public void set_autopush(bool val)
259 var cur = this.is_autopush();
260 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
262 return; // no change..
265 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
268 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
274 public void loadStatus()
276 var r = this.git({ "status" , "--porcelain" });
278 this.has_local_changes = r.length > 0;
280 var rs = this.git({ "status" , "-sb" });
282 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
285 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
289 public void loadBranches()
292 GitBranch.loadBranches(this);
298 public string branchesToString()
301 foreach( var br in this.branches.values) {
305 ret += ret.length > 0 ? "\n" : "";
312 public static void doMerges(string action, string ticket_id, string commit_message)
314 GitMonitor.gitmonitor.stop();
318 foreach(var repo in GitRepo.singleton().cache.values) {
319 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
320 var res = repo.doMerge(action,ticket_id, commit_message);
325 commitrevs += commitrevs.length > 0 ? " " : "";
326 commitrevs += repo.currentBranch.lastrev;
329 if (sucess && action == "CLOSE") {
330 RooTicket.singleton().getById(ticket_id).close(commitrevs);
332 GitMonitor.gitmonitor.start();
336 public bool doMerge(string action, string ticket_id, string commit_message)
338 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
339 // also need to decide which branch we will merge into?
341 if (action == "CLOSE" || action == "LEAVE") {
344 var oldbranch = this.currentBranch.name;
345 this.setActiveTicket(null, "master");
346 string [] cmd = { "merge", "--squash", oldbranch };
348 cmd = { "commit", "-a" , "-m", commit_message };
351 this.loadBranches(); // updates lastrev..
353 var notification = new Notify.Notification(
354 "Merged branch %s to master".printf(oldbranch),
360 notification.set_timeout(5);
368 GitMonitor.gitmonitor.pauseError(e.message);
371 // error~?? -- show the error dialog...
374 if (action == "MASTER") {
375 // merge master into ours..
377 string[] cmd = { "merge", "master" };
379 var notification = new Notify.Notification(
380 "Merged code from master to %s".printf(this.currentBranch.name),
385 notification.set_timeout(5);
390 GitMonitor.gitmonitor.pauseError(e.message);
394 if (action == "EXIT") {
396 var oldbranch = this.currentBranch.name;
397 this.setActiveTicket(null, "master");
399 var notification = new Notify.Notification(
400 "Left branch %s".printf(oldbranch),
405 notification.set_timeout(5);
410 GitMonitor.gitmonitor.pauseError(e.message);
414 // error~?? -- show the error dialog...
420 public void loadActiveTicket()
422 this.activeTicket = null;
423 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
427 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
428 if (ticket_id.length < 1) {
431 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
438 public bool setActiveTicket(RooTicket? ticket, string branchname)
440 if (!this.createBranchNamed(branchname)) {
443 if (ticket != null) {
444 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
446 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
448 this.activeTicket = ticket;
452 public bool createBranchNamed(string branchname)
456 if (this.branches.has_key(branchname)) {
457 this.switchToExistingBranchNamed(branchname);
460 this.createNewBranchNamed(branchname);
463 var notification = new Notify.Notification(
464 "Changed to branch %s".printf(branchname),
470 notification.set_timeout(5);
474 this.loadBranches(); // update branch list...
475 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
478 bool switchToExistingBranchNamed(string branchname)
481 // this is where it get's tricky...
484 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
485 files = this.git(cmd);
486 stash = files.length> 1 ;
490 if (stash) { this.git(cmd); }
494 cmd = { "checkout", branchname };
497 GitMonitor.gitmonitor.pauseError(e.message);
501 if (branchname != "master") {
502 string[] cmd = { "merge", "master" };
509 string[] cmd = { "checkout", "master" };
511 GitMonitor.gitmonitor.pauseError(
512 "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(
520 string[] cmd = { "stash", "pop" };
523 var fl = files.split("\n");
524 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
525 foreach(var f in fl) {
526 if (f.length < 1) continue;
535 GitMonitor.gitmonitor.pauseError(ee.message);
545 bool createNewBranchNamed(string branchname)
549 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
550 var files = this.git(cmd);
551 stash = files.length> 1 ;
553 cmd = { "checkout", "-b" , branchname };
556 cmd = { "push", "-u" , "origin" ,"HEAD" };
560 var fl = files.split("\n");
561 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
562 foreach(var f in fl) {
563 if (f.length < 1) continue;
572 GitMonitor.gitmonitor.pauseError(ee.message);
583 * add files to track.
585 * @argument {Array} files the files to add.
587 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
589 // should really find out if these are untracked files each..
590 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
591 // not sure if that is how git works.. but just be certian.
593 for (var i = 0; i < files.size;i++) {
594 var f = files.get(i).vname;
596 string[] cmd = { "add", f };
599 ret += e.message + "\n";
606 public bool is_ignore(string fname) throws Error, SpawnError
608 if (fname == ".gitignore") {
609 this.ignore_files.clear();
612 if (this.ignore_files.has_key(fname)) {
613 return this.ignore_files.get(fname);
617 var ret = this.git( { "check-ignore" , fname } );
618 this.ignore_files.set(fname, ret.length > 0);
619 return ret.length > 0;
620 } catch (SpawnError e) {
621 this.ignore_files.set(fname, false);
630 * remove files to track.
632 * @argument {Array} files the files to add.
634 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
636 // this may fail if files do not exist..
637 // should really find out if these are untracked files each..
638 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
639 // not sure if that is how git works.. but just be certian.
642 for (var i = 0; i < files.size;i++) {
643 var f = files.get(i).vname;
645 string[] cmd = { "rm", "-f" , f };
648 ret += e.message + "\n";
661 * @argument {Object} cfg commit configuration
663 * @property {String} name (optional)
664 * @property {String} email (optional)
665 * @property {String} changed (date) (optional)
666 * @property {String} reason (optional)
667 * @property {Array} files - the files that have changed.
671 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
678 if (typeof(cfg.name) != 'undefined') {
680 'author' : cfg.name + ' <' + cfg.email + '>'
683 "GIT_COMMITTER_NAME" + cfg.name,
684 "GIT_COMMITTER_EMAIL" + cfg.email
688 if (typeof(cfg.changed) != 'undefined') {
689 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
693 string[] args = { "commit", "-m" };
694 args += (message.length > 0 ? message : "Changed" );
695 for (var i = 0; i< files.size ; i++ ) {
696 args += files.get(i).vname; // full path?
699 return this.git(args);
704 * Fetch and merge remote repo changes into current branch..
706 * At present we just need this to update the current working branch..
707 * -- maybe later it will have a few options and do more stuff..
710 public string pull () throws Error, SpawnError
712 // should probably hand error conditions better...
713 string[] cmd = { "pull" , "--no-edit" };
714 return this.git( cmd );
719 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
720 public void pull_async(GitAsyncCallback cb)
723 string[] cmd = { "pull" , "--no-edit" };
724 this.git_async( cmd , cb);
731 * Send local changes to remote repo(s)
733 * At present we just need this to push the current branch.
734 * -- maybe later it will have a few options and do more stuff..
737 public string push () throws Error, SpawnError
740 return this.git({ "push" });
748 * The meaty part.. run spawn.. with git..
753 public string git(string[] args_in ) throws Error, SpawnError
755 // convert arguments.
757 string[] args = { "git" };
758 //args += "--git-dir";
759 //args += this.gitdir;
760 args += "--no-pager";
763 //if (this.gitdir != this.repopath) {
764 // args += "--work-tree";
765 // args += this.repopath;
767 for (var i = 0; i < args_in.length;i++) {
771 //this.lastCmd = args.join(" ");
773 GLib.debug( "CWD=%s", this.git_working_dir );
774 GLib.debug( "cmd: %s", string.joinv (" ", args));
778 string home = "HOME=" + Environment.get_home_dir() ;
780 // do not need to set gitpath..
781 //if (File.exists(this.repo + '/.git/config')) {
782 //env.push("GITPATH=" + this.repo );
785 var cfg = new SpawnConfig(this.git_working_dir , args , env);
788 // may throw error...
789 var sp = new Spawn(cfg);
791 // diff output is a bit big..
792 if (args_in[0] != "diff") {
793 GLib.debug( "GOT: %s" , sp.output);
795 // parse output for some commands ?
799 unowned GitAsyncCallback git_async_on_callback;
800 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
802 // convert arguments.
803 this.git_async_on_callback = cb;
804 string[] args = { "git" };
805 //args += "--git-dir";
806 //args += this.gitdir;
807 args += "--no-pager";
810 //if (this.gitdir != this.repopath) {
811 // args += "--work-tree";
812 // args += this.repopath;
814 for (var i = 0; i < args_in.length;i++) {
818 //this.lastCmd = args.join(" ");
820 GLib.debug( "CWD=%s", this.git_working_dir );
821 //print( "cmd: %s\n", string.joinv (" ", args));
825 string home = "HOME=" + Environment.get_home_dir() ;
827 // do not need to set gitpath..
828 //if (File.exists(this.repo + '/.git/config')) {
829 //env.push("GITPATH=" + this.repo );
833 var cfg = new SpawnConfig(this.git_working_dir , args , env);
837 // may throw error...
838 var sp = new Spawn(cfg);
841 sp.run(this.git_async_on_complete);
845 void git_async_on_complete(int err, string output)
847 GLib.debug("GOT %d : %s", err, output);
848 this.git_async_on_callback(this, err, output);
859 public void update_async(GitAsyncCallback cb)
861 string[] cmd = { "fetch" , "--all" };
862 this.git_async( cmd , cb);
867 static uint update_all_total = 0;
868 static string update_all_after = "";
870 public static void updateAll(string after)
872 update_all_after = after;
873 var tr = GitRepo.singleton().cache;
876 update_all_total = tr.size;
877 foreach(var repo in tr.values) {
878 if (!repo.is_managed()) {
882 repo.update_async(updateAllCallback);
886 public static void updateAllCallback(GitRepo repo, int err, string res)
892 if (update_all_total > 0 ) {
895 switch (update_all_after) {
897 Clones.singleton().show();