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;
22 public Gee.HashMap<string,bool> ignore_files;
23 public GitBranch currentBranch;
25 public RooTicket? activeTicket;
27 public static GitRepo singleton()
29 if (_GitRepo == null) {
30 _GitRepo = new GitRepo.single();
31 _GitRepo.cache = new Gee.HashMap<string,GitRepo>();
37 * index of.. matching gitpath..
39 public static int indexOf( Array<GitRepo> repos, string gitpath) {
40 // make a fake object to compare against..
41 var test_repo = GitRepo.get(gitpath);
43 for(var i =0; i < repos.length; i++) {
44 if (repos.index(i).gitdir == test_repo.gitdir) {
52 public Gee.HashMap<string,GitRepo> cache;
56 public static Array<GitRepo> list()
59 //if (GitRepo.list_cache != null) {
60 // unowned Array<GitRepo> ret = GitRepo.list_cache;
63 var cache = GitRepo.singleton().cache;
64 var list_cache = new Array<GitRepo>();
66 var dir = Environment.get_home_dir() + "/gitlive";
68 var f = File.new_for_path(dir);
69 FileEnumerator file_enum;
71 file_enum = f.enumerate_children(
72 FileAttribute.STANDARD_DISPLAY_NAME + ","+
73 FileAttribute.STANDARD_TYPE,
74 FileQueryInfoFlags.NONE,
87 next_file = file_enum.next_file(null);
88 if (next_file == null) {
93 GLib.debug("Error: %s",e.message);
97 //print("got a file " + next_file.sudo () + '?=' + Gio.FileType.DIRECTORY);
99 if (next_file.get_file_type() != FileType.DIRECTORY) {
104 if (next_file.get_file_type() == FileType.SYMBOLIC_LINK) {
109 if (next_file.get_display_name()[0] == '.') {
113 var sp = dir+"/"+next_file.get_display_name();
115 var gitdir = dir + "/" + next_file.get_display_name() + "/.git";
117 if (!FileUtils.test(gitdir, FileTest.IS_DIR)) {
121 var rep = GitRepo.get( sp );
122 list_cache.append_val(rep);
132 public static GitRepo get(string path)
134 var cache = GitRepo.singleton().cache;
135 if (cache.has_key(path)) {
136 return cache.get(path);
138 return new GitRepo(path);
141 private GitRepo.single() {
142 // used to create the signleton
147 * @param {Object} cfg - Configuration
148 * (basically repopath is currently only critical one.)
152 private GitRepo(string path) {
154 this.name = File.new_for_path(path).get_basename();
155 this.ignore_files = new Gee.HashMap<string,bool>();
157 this.git_working_dir = path;
158 this.gitdir = path + "/.git";
159 if (!FileUtils.test(this.gitdir , FileTest.IS_DIR)) {
160 this.gitdir = path; // naked...
162 this.cmds = new Gee.ArrayList<GitMonitorQueue> ();
164 var cache = GitRepo.singleton().cache;
165 //Repo.superclass.constructor.call(this,cfg);
166 if ( !cache.has_key(path) ) {
167 cache.set( path, this);
170 this.loadActiveTicket();
173 public bool is_wip_branch()
175 return this.currentBranch.name.has_prefix("wip_");
179 public bool is_autocommit ()
181 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
183 public void set_autocommit(bool val)
185 GLib.debug("SET auto commit : %s => %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
186 var cur = this.is_autocommit();
188 return; // no change..
191 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autocommit" , "x");
194 FileUtils.remove(this.gitdir + "/.gitlive-disable-autocommit" );
199 public bool is_auto_branch ()
201 return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
204 public void set_auto_branch(bool val)
207 var cur = this.is_auto_branch();
208 GLib.debug("SET auto branch : %s => %s", val ? "ON" : "OFF", cur ? "ON" : "OFF");
211 return; // no change..
214 FileUtils.set_contents(this.gitdir + "/.gitlive-enable-auto-branch" , "x");
217 FileUtils.remove(this.gitdir + "/.gitlive-enable-auto-branch" );
221 public bool is_autopush ()
223 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
225 public void set_autopush(bool val)
227 GLib.debug("SET auto push : %s", val ? "ON" : "OFF");
228 var cur = this.is_autopush();
230 return; // no change..
233 FileUtils.set_contents(this.gitdir + "/.gitlive-disable-autopush" , "");
236 FileUtils.remove(this.gitdir + "/.gitlive-disable-autopush" );
243 Gee.HashMap<string,GitBranch> branches;
245 public void loadBranches()
247 this.branches = new Gee.HashMap<string,GitBranch>();
249 string[] cmd = { "branch", "--no-color", "--verbose", "--no-abbrev" , "-a" };
250 var res = this.git( cmd );
251 var lines = res.split("\n");
252 for (var i = 0; i < lines.length ; i++) {
253 var br = new GitBranch(this);
254 if (!br.parseBranchListItem(lines[i])) {
257 GLib.debug("add branch %s", br.realName());
259 branches.set(br.realName(), br);
261 this.currentBranch = br;
270 public string branchesToString()
273 foreach( var br in this.branches.values) {
277 ret += ret.length > 0 ? "," : "";
284 public static void doMerges(string action, string ticket_id, string commit_message)
286 GitMonitor.gitmonitor.stop();
290 foreach(var repo in GitRepo.singleton().cache.values) {
291 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
292 var res = repo.doMerge(action,ticket_id, commit_message);
297 commitrevs += commitrevs.length > 0 ? " " : "";
298 commitrevs += repo.currentBranch.lastrev;
301 if (sucess && action == "CLOSE") {
302 RooTicket.singleton().getById(ticket_id).close(commitrevs);
304 GitMonitor.gitmonitor.start();
308 public bool doMerge(string action, string ticket_id, string commit_message)
310 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
311 // also need to decide which branch we will merge into?
313 if (action == "CLOSE" || action == "LEAVE") {
316 var oldbranch = this.currentBranch.name;
317 this.setActiveTicket(null, "master");
318 string [] cmd = { "merge", "--squash", oldbranch };
320 cmd = { "commit", "-a" , "-m", commit_message };
323 this.loadBranches(); // updates lastrev..
325 var notification = new Notify.Notification(
326 "Merged branch %s to master".printf(oldbranch),
332 notification.set_timeout(5);
340 GitMonitor.gitmonitor.pauseError(e.message);
343 // error~?? -- show the error dialog...
346 if (action == "MASTER") {
347 // merge master into ours..
349 string[] cmd = { "merge", "master" };
351 var notification = new Notify.Notification(
352 "Merged code from master to %s".printf(this.currentBranch.name),
357 notification.set_timeout(5);
362 GitMonitor.gitmonitor.pauseError(e.message);
366 if (action == "EXIT") {
368 var oldbranch = this.currentBranch.name;
369 this.setActiveTicket(null, "master");
371 var notification = new Notify.Notification(
372 "Left branch %s".printf(oldbranch),
377 notification.set_timeout(5);
382 GitMonitor.gitmonitor.pauseError(e.message);
386 // error~?? -- show the error dialog...
392 public void loadActiveTicket()
394 this.activeTicket = null;
395 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
399 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
400 if (ticket_id.length < 1) {
403 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
410 public bool setActiveTicket(RooTicket? ticket, string branchname)
412 if (!this.createBranchNamed(branchname)) {
415 if (ticket != null) {
416 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
418 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
420 this.activeTicket = ticket;
424 public bool createBranchNamed(string branchname)
428 if (this.branches.has_key(branchname)) {
429 // this is where it get's tricky...
431 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
432 var ret = this.git(cmd);
433 stash = ret.length> 1 ;
437 if (stash) { this.git(cmd); }
439 cmd = { "checkout", branchname };
442 GitMonitor.gitmonitor.pauseError(e.message);
446 if (branchname != "master") {
447 string[] cmd = { "merge", "master" };
450 //cmd = { "commit", "-a" , "-m", "merge master changes" };
451 //git chethis.git( cmd );
455 string[] cmd = { "checkout", "master" };
457 GitMonitor.gitmonitor.pauseError(
458 "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(
466 string[] cmd = { "stash", "pop" };
467 if (stash) { this.git(cmd); }
469 GitMonitor.gitmonitor.pauseError(ee.message);
477 string[] cmd = { "checkout", "-b" , branchname };
480 cmd = { "branch", "--set-upstream-to=origin/"+branchname , branchname };
484 GitMonitor.gitmonitor.pauseError(ee.message);
489 var notification = new Notify.Notification(
490 "Changed to branch %s".printf(branchname),
496 notification.set_timeout(5);
500 this.loadBranches(); // update branch list...
501 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
508 * add files to track.
510 * @argument {Array} files the files to add.
512 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
514 // should really find out if these are untracked files each..
515 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
516 // not sure if that is how git works.. but just be certian.
518 for (var i = 0; i < files.size;i++) {
519 var f = files.get(i).vname;
521 string[] cmd = { "add", f };
524 ret += e.message + "\n";
531 public bool is_ignore(string fname) throws Error, SpawnError
533 if (fname == ".gitignore") {
534 this.ignore_files.clear();
537 if (this.ignore_files.has_key(fname)) {
538 return this.ignore_files.get(fname);
542 var ret = this.git( { "check-ignore" , fname } );
543 this.ignore_files.set(fname, ret.length > 0);
544 return ret.length > 0;
545 } catch (SpawnError e) {
546 this.ignore_files.set(fname, false);
555 * remove files to track.
557 * @argument {Array} files the files to add.
559 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
561 // this may fail if files do not exist..
562 // should really find out if these are untracked files each..
563 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
564 // not sure if that is how git works.. but just be certian.
567 for (var i = 0; i < files.size;i++) {
568 var f = files.get(i).vname;
570 string[] cmd = { "rm", "-f" , f };
573 ret += e.message + "\n";
586 * @argument {Object} cfg commit configuration
588 * @property {String} name (optional)
589 * @property {String} email (optional)
590 * @property {String} changed (date) (optional)
591 * @property {String} reason (optional)
592 * @property {Array} files - the files that have changed.
596 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
603 if (typeof(cfg.name) != 'undefined') {
605 'author' : cfg.name + ' <' + cfg.email + '>'
608 "GIT_COMMITTER_NAME" + cfg.name,
609 "GIT_COMMITTER_EMAIL" + cfg.email
613 if (typeof(cfg.changed) != 'undefined') {
614 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
618 string[] args = { "commit", "-m" };
619 args += (message.length > 0 ? message : "Changed" );
620 for (var i = 0; i< files.size ; i++ ) {
621 args += files.get(i).vname; // full path?
624 return this.git(args);
629 * Fetch and merge remote repo changes into current branch..
631 * At present we just need this to update the current working branch..
632 * -- maybe later it will have a few options and do more stuff..
635 public string pull () throws Error, SpawnError
637 // should probably hand error conditions better...
638 string[] cmd = { "pull" , "--no-edit" };
639 return this.git( cmd );
644 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
645 public void pull_async(GitAsyncCallback cb)
648 string[] cmd = { "pull" , "--no-edit" };
649 this.git_async( cmd , cb);
656 * Send local changes to remote repo(s)
658 * At present we just need this to push the current branch.
659 * -- maybe later it will have a few options and do more stuff..
662 public string push () throws Error, SpawnError
665 return this.git({ "push" });
673 * The meaty part.. run spawn.. with git..
678 public string git(string[] args_in ) throws Error, SpawnError
680 // convert arguments.
682 string[] args = { "git" };
683 //args += "--git-dir";
684 //args += this.gitdir;
685 args += "--no-pager";
688 //if (this.gitdir != this.repopath) {
689 // args += "--work-tree";
690 // args += this.repopath;
692 for (var i = 0; i < args_in.length;i++) {
696 //this.lastCmd = args.join(" ");
698 GLib.debug( "CWD=%s", this.git_working_dir );
699 GLib.debug( "cmd: %s", string.joinv (" ", args));
703 string home = "HOME=" + Environment.get_home_dir() ;
705 // do not need to set gitpath..
706 //if (File.exists(this.repo + '/.git/config')) {
707 //env.push("GITPATH=" + this.repo );
711 var cfg = new SpawnConfig(this.git_working_dir , args , env);
714 // may throw error...
715 var sp = new Spawn(cfg);
718 GLib.debug( "GOT: %s" , sp.output);
719 // parse output for some commands ?
723 unowned GitAsyncCallback git_async_on_callback;
724 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
726 // convert arguments.
727 this.git_async_on_callback = cb;
728 string[] args = { "git" };
729 //args += "--git-dir";
730 //args += this.gitdir;
731 args += "--no-pager";
734 //if (this.gitdir != this.repopath) {
735 // args += "--work-tree";
736 // args += this.repopath;
738 for (var i = 0; i < args_in.length;i++) {
742 //this.lastCmd = args.join(" ");
744 GLib.debug( "CWD=%s", this.git_working_dir );
745 //print( "cmd: %s\n", string.joinv (" ", args));
749 string home = "HOME=" + Environment.get_home_dir() ;
751 // do not need to set gitpath..
752 //if (File.exists(this.repo + '/.git/config')) {
753 //env.push("GITPATH=" + this.repo );
757 var cfg = new SpawnConfig(this.git_working_dir , args , env);
761 // may throw error...
762 var sp = new Spawn(cfg);
765 sp.run(this.git_async_on_complete);
769 void git_async_on_complete(int err, string output)
771 GLib.debug("GOT %d : %s", err, output);
772 this.git_async_on_callback(this, err, output);