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);
184 public bool is_auto_branch ()
186 return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
188 public bool is_autopush ()
190 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
193 Gee.HashMap<string,GitBranch> branches;
195 public void loadBranches()
197 this.branches = new Gee.HashMap<string,GitBranch>();
199 string[] cmd = { "branch", "--no-color", "--verbose", "--no-abbrev" , "-a" };
200 var res = this.git( cmd );
201 var lines = res.split("\n");
202 for (var i = 0; i < lines.length ; i++) {
203 var br = new GitBranch(this);
204 if (!br.parseBranchListItem(lines[i])) {
207 GLib.debug("add branch %s", br.realName());
209 branches.set(br.realName(), br);
211 this.currentBranch = br;
220 public string branchesToString()
223 foreach( var br in this.branches.values) {
227 ret += ret.length > 0 ? "," : "";
234 public static void doMerges(string action, string ticket_id, string commit_message)
236 GitMonitor.gitmonitor.stop();
240 foreach(var repo in GitRepo.singleton().cache.values) {
241 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
242 var res = repo.doMerge(action,ticket_id, commit_message);
247 commitrevs += commitrevs.length > 0 ? " " : "";
248 commitrevs += repo.currentBranch.lastrev;
251 if (sucess && action == "CLOSE") {
252 RooTicket.singleton().getById(ticket_id).close(commitrevs);
254 GitMonitor.gitmonitor.start();
258 public bool doMerge(string action, string ticket_id, string commit_message)
260 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
261 // also need to decide which branch we will merge into?
263 if (action == "CLOSE" || action == "LEAVE") {
266 var oldbranch = this.currentBranch.name;
267 this.setActiveTicket(null, "master");
268 string [] cmd = { "merge", "--squash", oldbranch };
270 cmd = { "commit", "-a" , "-m", commit_message };
273 this.loadBranches(); // updates lastrev..
275 var notification = new Notify.Notification(
276 "Merged branch %s to master".printf(oldbranch),
282 notification.set_timeout(5);
290 GitMonitor.gitmonitor.pauseError(e.message);
293 // error~?? -- show the error dialog...
296 if (action == "MASTER") {
297 // merge master into ours..
299 string[] cmd = { "merge", "master" };
301 var notification = new Notify.Notification(
302 "Merged code from master to %s".printf(this.currentBranch.name),
307 notification.set_timeout(5);
312 GitMonitor.gitmonitor.pauseError(e.message);
316 if (action == "EXIT") {
318 var oldbranch = this.currentBranch.name;
319 this.setActiveTicket(null, "master");
321 var notification = new Notify.Notification(
322 "Left branch %s".printf(oldbranch),
327 notification.set_timeout(5);
332 GitMonitor.gitmonitor.pauseError(e.message);
336 // error~?? -- show the error dialog...
342 public void loadActiveTicket()
344 this.activeTicket = null;
345 if (!FileUtils.test(this.gitdir + "/.gitlive-active-ticket" , FileTest.EXISTS)) {
349 FileUtils.get_contents(this.gitdir + "/.gitlive-active-ticket" , out ticket_id);
350 if (ticket_id.length < 1) {
353 this.activeTicket = RooTicket.singleton().getById(ticket_id.strip());
360 public bool setActiveTicket(RooTicket? ticket, string branchname)
362 if (!this.createBranchNamed(branchname)) {
365 if (ticket != null) {
366 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
368 FileUtils.remove(this.gitdir + "/.gitlive-active-ticket" );
370 this.activeTicket = ticket;
374 public bool createBranchNamed(string branchname)
378 if (this.branches.has_key(branchname)) {
379 // this is where it get's tricky...
381 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
382 var ret = this.git(cmd);
383 stash = ret.length> 1 ;
387 if (stash) { this.git(cmd); }
389 cmd = { "checkout", branchname };
392 GitMonitor.gitmonitor.pauseError(e.message);
396 if (branchname != "master") {
397 string[] cmd = { "merge", "master" };
400 //cmd = { "commit", "-a" , "-m", "merge master changes" };
401 //git chethis.git( cmd );
405 string[] cmd = { "checkout", "master" };
407 GitMonitor.gitmonitor.pauseError(
408 "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(
416 string[] cmd = { "stash", "pop" };
417 if (stash) { this.git(cmd); }
419 GitMonitor.gitmonitor.pauseError(ee.message);
427 string[] cmd = { "checkout", "-b" , branchname };
430 cmd = { "branch", "--set-upstream-to=origin/"+branchname , branchname };
434 GitMonitor.gitmonitor.pauseError(ee.message);
439 var notification = new Notify.Notification(
440 "Changed to branch %s".printf(branchname),
446 notification.set_timeout(5);
450 this.loadBranches(); // update branch list...
451 //GitMonitor.gitmonitor.runQueue(); // no point - we have hidden the queue..
458 * add files to track.
460 * @argument {Array} files the files to add.
462 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
464 // should really find out if these are untracked files each..
465 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
466 // not sure if that is how git works.. but just be certian.
468 for (var i = 0; i < files.size;i++) {
469 var f = files.get(i).vname;
471 string[] cmd = { "add", f };
474 ret += e.message + "\n";
481 public bool is_ignore(string fname) throws Error, SpawnError
483 if (fname == ".gitignore") {
484 this.ignore_files.clear();
487 if (this.ignore_files.has_key(fname)) {
488 return this.ignore_files.get(fname);
492 var ret = this.git( { "check-ignore" , fname } );
493 this.ignore_files.set(fname, ret.length > 0);
494 return ret.length > 0;
495 } catch (SpawnError e) {
496 this.ignore_files.set(fname, false);
505 * remove files to track.
507 * @argument {Array} files the files to add.
509 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
511 // this may fail if files do not exist..
512 // should really find out if these are untracked files each..
513 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
514 // not sure if that is how git works.. but just be certian.
517 for (var i = 0; i < files.size;i++) {
518 var f = files.get(i).vname;
520 string[] cmd = { "rm", "-f" , f };
523 ret += e.message + "\n";
536 * @argument {Object} cfg commit configuration
538 * @property {String} name (optional)
539 * @property {String} email (optional)
540 * @property {String} changed (date) (optional)
541 * @property {String} reason (optional)
542 * @property {Array} files - the files that have changed.
546 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
553 if (typeof(cfg.name) != 'undefined') {
555 'author' : cfg.name + ' <' + cfg.email + '>'
558 "GIT_COMMITTER_NAME" + cfg.name,
559 "GIT_COMMITTER_EMAIL" + cfg.email
563 if (typeof(cfg.changed) != 'undefined') {
564 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
568 string[] args = { "commit", "-m" };
569 args += (message.length > 0 ? message : "Changed" );
570 for (var i = 0; i< files.size ; i++ ) {
571 args += files.get(i).vname; // full path?
574 return this.git(args);
579 * Fetch and merge remote repo changes into current branch..
581 * At present we just need this to update the current working branch..
582 * -- maybe later it will have a few options and do more stuff..
585 public string pull () throws Error, SpawnError
587 // should probably hand error conditions better...
588 string[] cmd = { "pull" , "--no-edit" };
589 return this.git( cmd );
594 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
595 public void pull_async(GitAsyncCallback cb)
598 string[] cmd = { "pull" , "--no-edit" };
599 this.git_async( cmd , cb);
606 * Send local changes to remote repo(s)
608 * At present we just need this to push the current branch.
609 * -- maybe later it will have a few options and do more stuff..
612 public string push () throws Error, SpawnError
615 return this.git({ "push" });
623 * The meaty part.. run spawn.. with git..
628 public string git(string[] args_in ) throws Error, SpawnError
630 // convert arguments.
632 string[] args = { "git" };
633 //args += "--git-dir";
634 //args += this.gitdir;
635 args += "--no-pager";
638 //if (this.gitdir != this.repopath) {
639 // args += "--work-tree";
640 // args += this.repopath;
642 for (var i = 0; i < args_in.length;i++) {
646 //this.lastCmd = args.join(" ");
648 GLib.debug( "CWD=%s", this.git_working_dir );
649 GLib.debug( "cmd: %s", string.joinv (" ", args));
653 string home = "HOME=" + Environment.get_home_dir() ;
655 // do not need to set gitpath..
656 //if (File.exists(this.repo + '/.git/config')) {
657 //env.push("GITPATH=" + this.repo );
661 var cfg = new SpawnConfig(this.git_working_dir , args , env);
664 // may throw error...
665 var sp = new Spawn(cfg);
668 GLib.debug( "GOT: %s" , sp.output);
669 // parse output for some commands ?
673 unowned GitAsyncCallback git_async_on_callback;
674 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
676 // convert arguments.
677 this.git_async_on_callback = cb;
678 string[] args = { "git" };
679 //args += "--git-dir";
680 //args += this.gitdir;
681 args += "--no-pager";
684 //if (this.gitdir != this.repopath) {
685 // args += "--work-tree";
686 // args += this.repopath;
688 for (var i = 0; i < args_in.length;i++) {
692 //this.lastCmd = args.join(" ");
694 GLib.debug( "CWD=%s", this.git_working_dir );
695 //print( "cmd: %s\n", string.joinv (" ", args));
699 string home = "HOME=" + Environment.get_home_dir() ;
701 // do not need to set gitpath..
702 //if (File.exists(this.repo + '/.git/config')) {
703 //env.push("GITPATH=" + this.repo );
707 var cfg = new SpawnConfig(this.git_working_dir , args , env);
711 // may throw error...
712 var sp = new Spawn(cfg);
715 sp.run(this.git_async_on_complete);
719 void git_async_on_complete(int err, string output)
721 GLib.debug("GOT %d : %s", err, output);
722 this.git_async_on_callback(this, err, output);