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);
172 public bool is_wip_branch()
174 return this.currentBranch.name.has_prefix("wip_");
178 public bool is_autocommit ()
180 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autocommit" , FileTest.EXISTS);
182 public bool is_autopush ()
184 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
187 Gee.HashMap<string,GitBranch> branches;
189 public void loadBranches()
191 this.branches = new Gee.HashMap<string,GitBranch>();
193 string[] cmd = { "branch", "--no-color", "--verbose", "--no-abbrev" , "-a" };
194 var res = this.git( cmd );
195 var lines = res.split("\n");
196 for (var i = 0; i < lines.length ; i++) {
197 var br = new GitBranch(this);
198 if (!br.parseBranchListItem(lines[i])) {
201 GLib.debug("add branch %s", br.realName());
203 branches.set(br.realName(), br);
205 this.currentBranch = br;
214 public string branchesToString()
217 foreach( var br in this.branches.values) {
221 ret += ret.length > 0 ? "," : "";
228 public static void doMerges(string action, string ticket_id, string commit_message)
230 GitMonitor.gitmonitor.stop();
234 foreach(var repo in GitRepo.singleton().cache.values) {
235 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
236 var res = repo.doMerge(action,ticket_id, commit_message);
241 commitrevs += commitrevs.length > 0 ? " " : "";
242 commitrevs += repo.currentBranch.lastrev;
245 if (sucess && action == "CLOSE") {
246 RooTicket.singleton().getById(ticket_id).close(commitrevs);
248 GitMonitor.gitmonitor.start();
254 public bool doMerge(string action, string ticket_id, string commit_message)
256 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
257 // also need to decide which branch we will merge into?
259 if (action == "CLOSE" || action == "LEAVE") {
263 var oldbranch = this.currentBranch.name;
264 this.setActiveTicket(null, "master");
265 string [] cmd = { "merge", "--squash", oldbranch };
267 cmd = { "commit", "--m", commit_message };
269 this.loadBranches(); // updates lastrev..
271 var notification = new Notify.Notification(
272 "Merged branch %s to master".printf(oldbranch),
278 notification.set_timeout(5);
286 GitMonitor.gitmonitor.pauseError(e.message);
289 // error~?? -- show the error dialog...
292 if (action == "MASTER") {
293 // merge master into ours..
295 string[] cmd = { "merge", "master" };
297 var notification = new Notify.Notification(
298 "Merged code from master to %s".printf(this.currentBranch.name),
303 notification.set_timeout(5);
308 GitMonitor.gitmonitor.pauseError(e.message);
312 if (action == "EXIT") {
314 var oldbranch = this.currentBranch.name;
315 this.setActiveTicket(null, "master");
317 var notification = new Notify.Notification(
318 "Left branch %s".printf(oldbranch),
323 notification.set_timeout(5);
328 GitMonitor.gitmonitor.pauseError(e.message);
332 // error~?? -- show the error dialog...
339 public bool setActiveTicket(RooTicket ticket, string branchname)
341 if (!this.createBranchNamed(branchname)) {
344 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
345 this.activeTicket = ticket;
349 public bool createBranchNamed(string branchname)
353 if (this.branches.has_key(branchname)) {
354 // this is where it get's tricky...
356 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
357 var ret = this.git(cmd);
358 var stash = ret.length> 1 ;
362 if (stash) { this.git(cmd); }
364 cmd = { "checkout", branchname };
367 GitMonitor.gitmonitor.pauseError(e.message);
372 cmd = { "merge", "master" };
376 cmd = { "mergetool" };
378 cmd = { "commit" "-m" "Fix merge conflicts from master" };
381 GitMonitor.gitmonitor.pauseError(ee.message);
386 cmd = { "stash", "pop" };
387 if (stash) { this.git(cmd); }
389 GitMonitor.gitmonitor.pauseError(ee.message);
397 string[] cmd = { "checkout", "-b" , branchname };
400 GitMonitor.gitmonitor.pauseError(ee.message);
405 var notification = new Notify.Notification(
406 "Changed to branch %s".printf(branchname),
412 notification.set_timeout(5);
417 GitMonitor.gitmonitor.pauseError(e.message);
421 this.loadBranches(); // update branch list...
422 GitMonitor.gitmonitor.runQueue(); // commit any outstanding...
429 * add files to track.
431 * @argument {Array} files the files to add.
433 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
435 // should really find out if these are untracked files each..
436 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
437 // not sure if that is how git works.. but just be certian.
439 for (var i = 0; i < files.size;i++) {
440 var f = files.get(i).vname;
442 string[] cmd = { "add", f };
445 ret += e.message + "\n";
452 public bool is_ignore(string fname) throws Error, SpawnError
454 if (fname == ".gitignore") {
455 this.ignore_files.clear();
458 if (this.ignore_files.has_key(fname)) {
459 return this.ignore_files.get(fname);
463 var ret = this.git( { "check-ignore" , fname } );
464 this.ignore_files.set(fname, ret.length > 0);
465 return ret.length > 0;
466 } catch (SpawnError e) {
467 this.ignore_files.set(fname, false);
476 * remove files to track.
478 * @argument {Array} files the files to add.
480 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
482 // this may fail if files do not exist..
483 // should really find out if these are untracked files each..
484 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
485 // not sure if that is how git works.. but just be certian.
488 for (var i = 0; i < files.size;i++) {
489 var f = files.get(i).vname;
491 string[] cmd = { "rm", "-f" , f };
494 ret += e.message + "\n";
507 * @argument {Object} cfg commit configuration
509 * @property {String} name (optional)
510 * @property {String} email (optional)
511 * @property {String} changed (date) (optional)
512 * @property {String} reason (optional)
513 * @property {Array} files - the files that have changed.
517 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
524 if (typeof(cfg.name) != 'undefined') {
526 'author' : cfg.name + ' <' + cfg.email + '>'
529 "GIT_COMMITTER_NAME" + cfg.name,
530 "GIT_COMMITTER_EMAIL" + cfg.email
534 if (typeof(cfg.changed) != 'undefined') {
535 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
539 string[] args = { "commit", "-m" };
540 args += (message.length > 0 ? message : "Changed" );
541 for (var i = 0; i< files.size ; i++ ) {
542 args += files.get(i).vname; // full path?
545 return this.git(args);
550 * Fetch and merge remote repo changes into current branch..
552 * At present we just need this to update the current working branch..
553 * -- maybe later it will have a few options and do more stuff..
556 public string pull () throws Error, SpawnError
558 // should probably hand error conditions better...
559 string[] cmd = { "pull" , "--no-edit" };
560 return this.git( cmd );
565 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
566 public void pull_async(GitAsyncCallback cb)
569 string[] cmd = { "pull" , "--no-edit" };
570 this.git_async( cmd , cb);
577 * Send local changes to remote repo(s)
579 * At present we just need this to push the current branch.
580 * -- maybe later it will have a few options and do more stuff..
583 public string push () throws Error, SpawnError
586 return this.git({ "push", "origin", "HEAD" });
594 * The meaty part.. run spawn.. with git..
599 public string git(string[] args_in ) throws Error, SpawnError
601 // convert arguments.
603 string[] args = { "git" };
604 //args += "--git-dir";
605 //args += this.gitdir;
606 args += "--no-pager";
609 //if (this.gitdir != this.repopath) {
610 // args += "--work-tree";
611 // args += this.repopath;
613 for (var i = 0; i < args_in.length;i++) {
617 //this.lastCmd = args.join(" ");
619 GLib.debug( "CWD=%s", this.git_working_dir );
620 GLib.debug( "cmd: %s", string.joinv (" ", args));
624 string home = "HOME=" + Environment.get_home_dir() ;
626 // do not need to set gitpath..
627 //if (File.exists(this.repo + '/.git/config')) {
628 //env.push("GITPATH=" + this.repo );
632 var cfg = new SpawnConfig(this.git_working_dir , args , env);
635 // may throw error...
636 var sp = new Spawn(cfg);
639 GLib.debug( "GOT: %s" , sp.output);
640 // parse output for some commands ?
644 unowned GitAsyncCallback git_async_on_callback;
645 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
647 // convert arguments.
648 this.git_async_on_callback = cb;
649 string[] args = { "git" };
650 //args += "--git-dir";
651 //args += this.gitdir;
652 args += "--no-pager";
655 //if (this.gitdir != this.repopath) {
656 // args += "--work-tree";
657 // args += this.repopath;
659 for (var i = 0; i < args_in.length;i++) {
663 //this.lastCmd = args.join(" ");
665 GLib.debug( "CWD=%s", this.git_working_dir );
666 //print( "cmd: %s\n", string.joinv (" ", args));
670 string home = "HOME=" + Environment.get_home_dir() ;
672 // do not need to set gitpath..
673 //if (File.exists(this.repo + '/.git/config')) {
674 //env.push("GITPATH=" + this.repo );
678 var cfg = new SpawnConfig(this.git_working_dir , args , env);
682 // may throw error...
683 var sp = new Spawn(cfg);
686 sp.run(this.git_async_on_complete);
690 void git_async_on_complete(int err, string output)
692 GLib.debug("GOT %d : %s", err, output);
693 this.git_async_on_callback(this, err, output);