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";
192 public void init_config()
195 if (this.get_config("managed") == "") {
196 this.set_config("managed", this.host == "git.roojs.com" ? "1" : "0");
198 if (this.get_config("autocommit") == "") {
199 this.set_config("autocommit", this.host == "git.roojs.com" ? "1" : "0");
206 public string get_config(string key) {
207 return this.git({ "config" , "gitlive." + key });
209 public string set_config(string key, string value) {
210 return this.git({ "config" , "gitlive." + key, value });
213 public bool is_managed()
215 return this.get_config("managed") == "1";
219 public bool is_autocommit ()
221 return this.get_config("autocommit") == "1";
223 public void set_autocommit(bool val)
226 var cur = this.is_autocommit();
227 GLib.debug("SET auto commit : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
229 return; // no change..
232 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
235 FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" );
240 public bool is_auto_branch ()
242 if (this.name == "gitlog") {
246 if (this.is_managed()) {
254 public void set_auto_branch(bool val)
257 var cur = this.is_auto_branch();
258 GLib.debug("SET auto branch : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
261 return; // no change..
263 if (this.host != "git.roojs.com") { // we can only push to this url. -- unless we have forced it to be managed.
264 // remote is not our server..
266 FileUtils.set_contents(this.gitdir + "/.gitlive-managed" , "x");
268 FileUtils.remove(this.gitdir + "/.gitlive-managed" );
275 FileUtils.remove(this.gitdir + "/.gitlive-unmanaged" );
277 FileUtils.set_contents(this.gitdir + "/.gitlive-unmanaged" , "x");
283 public bool is_autopush ()
285 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
287 public void set_autopush(bool val)
290 var cur = this.is_autopush();
291 GLib.debug("SET auto push : %s <= %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
293 return; // no change..
296 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
299 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
305 public void loadStatus()
307 var r = this.git({ "status" , "--porcelain" });
309 this.has_local_changes = r.length > 0;
311 var rs = this.git({ "status" , "-sb" });
313 this.ahead_or_behind = rs.contains("[ahead") ? "A" : (rs.contains("[behind") ? "B" : "");
316 this.git_diff = this.git({ "diff" , "HEAD", "--no-color" });
320 public void loadBranches()
323 GitBranch.loadBranches(this);
329 public string branchesToString()
332 foreach( var br in this.branches.values) {
336 ret += ret.length > 0 ? "\n" : "";
343 public static void doMerges(string action, string ticket_id, string commit_message)
345 GitMonitor.gitmonitor.stop();
349 foreach(var repo in GitRepo.singleton().cache.values) {
350 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
351 var res = repo.doMerge(action,ticket_id, commit_message);
356 commitrevs += commitrevs.length > 0 ? " " : "";
357 commitrevs += repo.currentBranch.lastrev;
360 if (sucess && action == "CLOSE") {
361 RooTicket.singleton().getById(ticket_id).close(commitrevs);
363 GitMonitor.gitmonitor.start();
367 public bool doMerge(string action, string ticket_id, string commit_message)
369 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
370 // also need to decide which branch we will merge into?
372 if (action == "CLOSE" || action == "LEAVE") {
375 var oldbranch = this.currentBranch.name;
376 this.setActiveTicket(null, "master");
377 string [] cmd = { "merge", "--squash", oldbranch };
379 cmd = { "commit", "-a" , "-m", commit_message };
382 this.loadBranches(); // updates lastrev..
384 var notification = new Notify.Notification(
385 "Merged branch %s to master".printf(oldbranch),
391 notification.set_timeout(5);
399 GitMonitor.gitmonitor.pauseError(e.message);
402 // error~?? -- show the error dialog...
405 if (action == "MASTER") {
406 // merge master into ours..
408 string[] cmd = { "merge", "master" };
410 var notification = new Notify.Notification(
411 "Merged code from master to %s".printf(this.currentBranch.name),
416 notification.set_timeout(5);
421 GitMonitor.gitmonitor.pauseError(e.message);
425 if (action == "EXIT") {
427 var oldbranch = this.currentBranch.name;
428 this.setActiveTicket(null, "master");
430 var notification = new Notify.Notification(
431 "Left branch %s".printf(oldbranch),
436 notification.set_timeout(5);
441 GitMonitor.gitmonitor.pauseError(e.message);
445 // error~?? -- show the error dialog...
451 public void loadActiveTicket()
453 this.activeTicket = null;
454 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
458 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
459 if (ticket_id.length < 1) {
462 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
469 public bool setActiveTicket(RooTicket? ticket, string branchname)
471 if (!this.createBranchNamed(branchname)) {
474 if (ticket != null) {
475 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
477 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
479 this.activeTicket = ticket;
483 public bool createBranchNamed(string branchname)
487 if (this.branches.has_key(branchname)) {
488 this.switchToExistingBranchNamed(branchname);
491 this.createNewBranchNamed(branchname);
494 var notification = new Notify.Notification(
495 "Changed to branch %s".printf(branchname),
501 notification.set_timeout(5);
505 this.loadBranches(); // update branch list...
506 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
509 bool switchToExistingBranchNamed(string branchname)
512 // this is where it get's tricky...
515 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
516 files = this.git(cmd);
517 stash = files.length> 1 ;
521 if (stash) { this.git(cmd); }
525 cmd = { "checkout", branchname };
528 GitMonitor.gitmonitor.pauseError(e.message);
532 if (branchname != "master") {
533 string[] cmd = { "merge", "master" };
540 string[] cmd = { "checkout", "master" };
542 GitMonitor.gitmonitor.pauseError(
543 "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(
551 string[] cmd = { "stash", "pop" };
554 var fl = files.split("\n");
555 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
556 foreach(var f in fl) {
557 if (f.length < 1) continue;
566 GitMonitor.gitmonitor.pauseError(ee.message);
576 bool createNewBranchNamed(string branchname)
580 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
581 var files = this.git(cmd);
582 stash = files.length> 1 ;
584 cmd = { "checkout", "-b" , branchname };
587 cmd = { "push", "-u" , "origin" ,"HEAD" };
591 var fl = files.split("\n");
592 cmd = { "commit", "-m" , "Changed " + string.joinv("",fl) };
593 foreach(var f in fl) {
594 if (f.length < 1) continue;
603 GitMonitor.gitmonitor.pauseError(ee.message);
614 * add files to track.
616 * @argument {Array} files the files to add.
618 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
620 // should really find out if these are untracked files each..
621 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
622 // not sure if that is how git works.. but just be certian.
624 for (var i = 0; i < files.size;i++) {
625 var f = files.get(i).vname;
627 string[] cmd = { "add", f };
630 ret += e.message + "\n";
637 public bool is_ignore(string fname) throws Error, SpawnError
639 if (fname == ".gitignore") {
640 this.ignore_files.clear();
643 if (this.ignore_files.has_key(fname)) {
644 return this.ignore_files.get(fname);
648 var ret = this.git( { "check-ignore" , fname } );
649 this.ignore_files.set(fname, ret.length > 0);
650 return ret.length > 0;
651 } catch (SpawnError e) {
652 this.ignore_files.set(fname, false);
661 * remove files to track.
663 * @argument {Array} files the files to add.
665 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
667 // this may fail if files do not exist..
668 // should really find out if these are untracked files each..
669 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
670 // not sure if that is how git works.. but just be certian.
673 for (var i = 0; i < files.size;i++) {
674 var f = files.get(i).vname;
676 string[] cmd = { "rm", "-f" , f };
679 ret += e.message + "\n";
692 * @argument {Object} cfg commit configuration
694 * @property {String} name (optional)
695 * @property {String} email (optional)
696 * @property {String} changed (date) (optional)
697 * @property {String} reason (optional)
698 * @property {Array} files - the files that have changed.
702 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
709 if (typeof(cfg.name) != 'undefined') {
711 'author' : cfg.name + ' <' + cfg.email + '>'
714 "GIT_COMMITTER_NAME" + cfg.name,
715 "GIT_COMMITTER_EMAIL" + cfg.email
719 if (typeof(cfg.changed) != 'undefined') {
720 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
724 string[] args = { "commit", "-m" };
725 args += (message.length > 0 ? message : "Changed" );
726 for (var i = 0; i< files.size ; i++ ) {
727 args += files.get(i).vname; // full path?
730 return this.git(args);
735 * Fetch and merge remote repo changes into current branch..
737 * At present we just need this to update the current working branch..
738 * -- maybe later it will have a few options and do more stuff..
741 public string pull () throws Error, SpawnError
743 // should probably hand error conditions better...
744 string[] cmd = { "pull" , "--no-edit" };
745 return this.git( cmd );
750 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
751 public void pull_async(GitAsyncCallback cb)
754 string[] cmd = { "pull" , "--no-edit" };
755 this.git_async( cmd , cb);
762 * Send local changes to remote repo(s)
764 * At present we just need this to push the current branch.
765 * -- maybe later it will have a few options and do more stuff..
768 public string push () throws Error, SpawnError
771 return this.git({ "push" });
779 * The meaty part.. run spawn.. with git..
784 public string git(string[] args_in ) throws Error, SpawnError
786 // convert arguments.
788 string[] args = { "git" };
789 //args += "--git-dir";
790 //args += this.gitdir;
791 args += "--no-pager";
794 //if (this.gitdir != this.repopath) {
795 // args += "--work-tree";
796 // args += this.repopath;
798 for (var i = 0; i < args_in.length;i++) {
802 //this.lastCmd = args.join(" ");
804 GLib.debug( "CWD=%s", this.git_working_dir );
805 GLib.debug( "cmd: %s", string.joinv (" ", args));
809 string home = "HOME=" + Environment.get_home_dir() ;
811 // do not need to set gitpath..
812 //if (File.exists(this.repo + '/.git/config')) {
813 //env.push("GITPATH=" + this.repo );
816 var cfg = new SpawnConfig(this.git_working_dir , args , env);
819 // may throw error...
820 var sp = new Spawn(cfg);
822 // diff output is a bit big..
823 if (args_in[0] != "diff") {
824 GLib.debug( "GOT: %s" , sp.output);
826 // parse output for some commands ?
830 unowned GitAsyncCallback git_async_on_callback;
831 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
833 // convert arguments.
834 this.git_async_on_callback = cb;
835 string[] args = { "git" };
836 //args += "--git-dir";
837 //args += this.gitdir;
838 args += "--no-pager";
841 //if (this.gitdir != this.repopath) {
842 // args += "--work-tree";
843 // args += this.repopath;
845 for (var i = 0; i < args_in.length;i++) {
849 //this.lastCmd = args.join(" ");
851 GLib.debug( "CWD=%s", this.git_working_dir );
852 //print( "cmd: %s\n", string.joinv (" ", args));
856 string home = "HOME=" + Environment.get_home_dir() ;
858 // do not need to set gitpath..
859 //if (File.exists(this.repo + '/.git/config')) {
860 //env.push("GITPATH=" + this.repo );
864 var cfg = new SpawnConfig(this.git_working_dir , args , env);
868 // may throw error...
869 var sp = new Spawn(cfg);
872 sp.run(this.git_async_on_complete);
876 void git_async_on_complete(int err, string output)
878 GLib.debug("GOT %d : %s", err, output);
879 this.git_async_on_callback(this, err, output);
890 public void update_async(GitAsyncCallback cb)
892 string[] cmd = { "fetch" , "--all" };
893 this.git_async( cmd , cb);
898 static uint update_all_total = 0;
899 static string update_all_after = "";
901 public static void updateAll(string after)
903 update_all_after = after;
904 var tr = GitRepo.singleton().cache;
907 update_all_total = tr.size;
908 foreach(var repo in tr.values) {
909 if (!repo.is_managed()) {
913 repo.update_async(updateAllCallback);
917 public static void updateAllCallback(GitRepo repo, int err, string res)
923 if (update_all_total > 0 ) {
926 switch (update_all_after) {
928 Clones.singleton().show();