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);
183 public bool is_auto_branch ()
185 return FileUtils.test(this.gitdir + "/.gitlive-enable-auto-branch" , FileTest.EXISTS);
187 public bool is_autopush ()
189 return !FileUtils.test(this.gitdir + "/.gitlive-disable-autopush" , FileTest.EXISTS);
192 Gee.HashMap<string,GitBranch> branches;
194 public void loadBranches()
196 this.branches = new Gee.HashMap<string,GitBranch>();
198 string[] cmd = { "branch", "--no-color", "--verbose", "--no-abbrev" , "-a" };
199 var res = this.git( cmd );
200 var lines = res.split("\n");
201 for (var i = 0; i < lines.length ; i++) {
202 var br = new GitBranch(this);
203 if (!br.parseBranchListItem(lines[i])) {
206 GLib.debug("add branch %s", br.realName());
208 branches.set(br.realName(), br);
210 this.currentBranch = br;
219 public string branchesToString()
222 foreach( var br in this.branches.values) {
226 ret += ret.length > 0 ? "," : "";
233 public static void doMerges(string action, string ticket_id, string commit_message)
235 GitMonitor.gitmonitor.stop();
239 foreach(var repo in GitRepo.singleton().cache.values) {
240 if (repo.activeTicket != null && repo.activeTicket.id == ticket_id) {
241 var res = repo.doMerge(action,ticket_id, commit_message);
246 commitrevs += commitrevs.length > 0 ? " " : "";
247 commitrevs += repo.currentBranch.lastrev;
250 if (sucess && action == "CLOSE") {
251 RooTicket.singleton().getById(ticket_id).close(commitrevs);
253 GitMonitor.gitmonitor.start();
257 public bool doMerge(string action, string ticket_id, string commit_message)
259 // in theory we should check to see if other repo's have got the same branch and merge all them at the same time.
260 // also need to decide which branch we will merge into?
262 if (action == "CLOSE" || action == "LEAVE") {
265 var oldbranch = this.currentBranch.name;
266 this.setActiveTicket(null, "master");
267 string [] cmd = { "merge", "--squash", oldbranch };
269 cmd = { "commit", "-a" , "-m", commit_message };
272 this.loadBranches(); // updates lastrev..
274 var notification = new Notify.Notification(
275 "Merged branch %s to master".printf(oldbranch),
281 notification.set_timeout(5);
289 GitMonitor.gitmonitor.pauseError(e.message);
292 // error~?? -- show the error dialog...
295 if (action == "MASTER") {
296 // merge master into ours..
298 string[] cmd = { "merge", "master" };
300 var notification = new Notify.Notification(
301 "Merged code from master to %s".printf(this.currentBranch.name),
306 notification.set_timeout(5);
311 GitMonitor.gitmonitor.pauseError(e.message);
315 if (action == "EXIT") {
317 var oldbranch = this.currentBranch.name;
318 this.setActiveTicket(null, "master");
320 var notification = new Notify.Notification(
321 "Left branch %s".printf(oldbranch),
326 notification.set_timeout(5);
331 GitMonitor.gitmonitor.pauseError(e.message);
335 // error~?? -- show the error dialog...
342 public bool setActiveTicket(RooTicket ticket, string branchname)
344 if (!this.createBranchNamed(branchname)) {
347 FileUtils.set_contents(this.gitdir + "/.gitlive-active-ticket" , ticket.id);
348 this.activeTicket = ticket;
352 public bool createBranchNamed(string branchname)
356 if (this.branches.has_key(branchname)) {
357 // this is where it get's tricky...
359 string[] cmd = { "ls-files" , "-m" }; // list the modified files..
360 var ret = this.git(cmd);
361 stash = ret.length> 1 ;
365 if (stash) { this.git(cmd); }
367 cmd = { "checkout", branchname };
370 GitMonitor.gitmonitor.pauseError(e.message);
374 if (branchname != "master") {
375 string[] cmd = { "merge", "master" };
378 //cmd = { "commit", "-a" , "-m", "merge master changes" };
379 //git chethis.git( cmd );
383 string[] cmd = { "checkout", "master" };
385 GitMonitor.gitmonitor.pauseError(
386 "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(
394 string[] cmd = { "stash", "pop" };
395 if (stash) { this.git(cmd); }
397 GitMonitor.gitmonitor.pauseError(ee.message);
405 string[] cmd = { "checkout", "-b" , branchname };
410 GitMonitor.gitmonitor.pauseError(ee.message);
415 var notification = new Notify.Notification(
416 "Changed to branch %s".printf(branchname),
422 notification.set_timeout(5);
426 this.loadBranches(); // update branch list...
427 GitMonitor.gitmonitor.runQueue(); // commit any outstanding...
434 * add files to track.
436 * @argument {Array} files the files to add.
438 public string add ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
440 // should really find out if these are untracked files each..
441 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
442 // not sure if that is how git works.. but just be certian.
444 for (var i = 0; i < files.size;i++) {
445 var f = files.get(i).vname;
447 string[] cmd = { "add", f };
450 ret += e.message + "\n";
457 public bool is_ignore(string fname) throws Error, SpawnError
459 if (fname == ".gitignore") {
460 this.ignore_files.clear();
463 if (this.ignore_files.has_key(fname)) {
464 return this.ignore_files.get(fname);
468 var ret = this.git( { "check-ignore" , fname } );
469 this.ignore_files.set(fname, ret.length > 0);
470 return ret.length > 0;
471 } catch (SpawnError e) {
472 this.ignore_files.set(fname, false);
481 * remove files to track.
483 * @argument {Array} files the files to add.
485 public string remove ( Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
487 // this may fail if files do not exist..
488 // should really find out if these are untracked files each..
489 // we run multiple versions to make sure that if one failes, it does not ignore the whole lot..
490 // not sure if that is how git works.. but just be certian.
493 for (var i = 0; i < files.size;i++) {
494 var f = files.get(i).vname;
496 string[] cmd = { "rm", "-f" , f };
499 ret += e.message + "\n";
512 * @argument {Object} cfg commit configuration
514 * @property {String} name (optional)
515 * @property {String} email (optional)
516 * @property {String} changed (date) (optional)
517 * @property {String} reason (optional)
518 * @property {Array} files - the files that have changed.
522 public string commit ( string message, Gee.ArrayList<GitMonitorQueue> files ) throws Error, SpawnError
529 if (typeof(cfg.name) != 'undefined') {
531 'author' : cfg.name + ' <' + cfg.email + '>'
534 "GIT_COMMITTER_NAME" + cfg.name,
535 "GIT_COMMITTER_EMAIL" + cfg.email
539 if (typeof(cfg.changed) != 'undefined') {
540 env.push("GIT_AUTHOR_DATE= " + cfg.changed )
544 string[] args = { "commit", "-m" };
545 args += (message.length > 0 ? message : "Changed" );
546 for (var i = 0; i< files.size ; i++ ) {
547 args += files.get(i).vname; // full path?
550 return this.git(args);
555 * Fetch and merge remote repo changes into current branch..
557 * At present we just need this to update the current working branch..
558 * -- maybe later it will have a few options and do more stuff..
561 public string pull () throws Error, SpawnError
563 // should probably hand error conditions better...
564 string[] cmd = { "pull" , "--no-edit" };
565 return this.git( cmd );
570 public delegate void GitAsyncCallback (GitRepo repo, int err, string str);
571 public void pull_async(GitAsyncCallback cb)
574 string[] cmd = { "pull" , "--no-edit" };
575 this.git_async( cmd , cb);
582 * Send local changes to remote repo(s)
584 * At present we just need this to push the current branch.
585 * -- maybe later it will have a few options and do more stuff..
588 public string push () throws Error, SpawnError
591 return this.git({ "push", "--all" });
599 * The meaty part.. run spawn.. with git..
604 public string git(string[] args_in ) throws Error, SpawnError
606 // convert arguments.
608 string[] args = { "git" };
609 //args += "--git-dir";
610 //args += this.gitdir;
611 args += "--no-pager";
614 //if (this.gitdir != this.repopath) {
615 // args += "--work-tree";
616 // args += this.repopath;
618 for (var i = 0; i < args_in.length;i++) {
622 //this.lastCmd = args.join(" ");
624 GLib.debug( "CWD=%s", this.git_working_dir );
625 GLib.debug( "cmd: %s", string.joinv (" ", args));
629 string home = "HOME=" + Environment.get_home_dir() ;
631 // do not need to set gitpath..
632 //if (File.exists(this.repo + '/.git/config')) {
633 //env.push("GITPATH=" + this.repo );
637 var cfg = new SpawnConfig(this.git_working_dir , args , env);
640 // may throw error...
641 var sp = new Spawn(cfg);
644 GLib.debug( "GOT: %s" , sp.output);
645 // parse output for some commands ?
649 unowned GitAsyncCallback git_async_on_callback;
650 public void git_async( string[] args_in, GitAsyncCallback cb ) throws Error, SpawnError
652 // convert arguments.
653 this.git_async_on_callback = cb;
654 string[] args = { "git" };
655 //args += "--git-dir";
656 //args += this.gitdir;
657 args += "--no-pager";
660 //if (this.gitdir != this.repopath) {
661 // args += "--work-tree";
662 // args += this.repopath;
664 for (var i = 0; i < args_in.length;i++) {
668 //this.lastCmd = args.join(" ");
670 GLib.debug( "CWD=%s", this.git_working_dir );
671 //print( "cmd: %s\n", string.joinv (" ", args));
675 string home = "HOME=" + Environment.get_home_dir() ;
677 // do not need to set gitpath..
678 //if (File.exists(this.repo + '/.git/config')) {
679 //env.push("GITPATH=" + this.repo );
683 var cfg = new SpawnConfig(this.git_working_dir , args , env);
687 // may throw error...
688 var sp = new Spawn(cfg);
691 sp.run(this.git_async_on_complete);
695 void git_async_on_complete(int err, string output)
697 GLib.debug("GOT %d : %s", err, output);
698 this.git_async_on_callback(this, err, output);