@@ -13,6 +13,7 @@ Iobuf: import bufio; include "utils.m"; utils: Utils; +bytepos, sha2string, SHALEN: import utils; include "cat-file.m"; @@ -36,14 +37,25 @@ init(repopath: string, typeonly: int, path: string, ch: chan of array of byte) catfile(path: string) { (filetype, filesize, buf) := utils->readsha1file(path); - offset := 0; msgchan <-= sys->aprint("filetype: %s\n", filetype); if(printtypeonly){ msgchan <-= nil; return; } - msgchan <-= buf[offset:]; + str := ""; + offset := 0; + while(filetype == "tree" && (pos := bytepos(buf, offset, byte 0)) != -1){ + pos++; + sha1 := buf[pos: pos + SHALEN]; + str += string buf[offset: pos - 1]; + str += " " + sha2string(sha1); + offset = pos + SHALEN; + } + if(filetype == "tree") + msgchan <-= sys->aprint("%s", str); + else + msgchan <-= buf[:]; } usage() cat-file.b @@ -39,19 +39,18 @@ init(args: list of string) utils = load Utils Utils->PATH; REPOPATH = hd args; - args = tl args; + utils->init(REPOPATH); index = Index.new(REPOPATH); stderr = sys->fildes(2); - if(!index.readindex(REPOPATH + INDEXPATH)) + if(!index.readindex(INDEXPATH)) { sys->fprint(stderr, "index read error\n"); exit; } arg->init(args); - while((c := arg->opt()) != 0) - { + while((c := arg->opt()) != 0){ case c { 'a' => all = 1; @@ -118,7 +117,10 @@ checkoutentry(fd: ref Sys->FD, entry: ref Entry) checkoutall() { for(l := index.entries.all(); l != nil; l = tl l) + { + sys->print("checking out: %s\n", (hd l).name); checkoutfile((hd l).name); + } } dirname(path: string): string @@ -135,6 +137,7 @@ makedirs(path: string) if(!exists(path)) makedirs(dirname(path)); sys->create(path, Sys->OREAD, Sys->DMDIR|8r755); + } exists(path: string): int checkout-index.b @@ -1,6 +1,7 @@ Checkoutindex: module { + PATH: con "/dis/git/checkout-index.dis"; init: fn(args: list of string); }; checkout-index.m @@ -56,7 +56,7 @@ init(args: list of string) check() { - readrepo(OBJECTSTOREPATH); + readrepo(REPOPATH + OBJECTSTOREPATH); cnt := 0; for(i := 0; i < HASHSZ; i++){ checkrepo.b @@ -1,5 +1,6 @@ Checkrepo: module { + PATH: con "/dis/git/checkrepo.dis"; init: fn(args: list of string); }; checkrepo.m @@ -58,33 +58,31 @@ init(args: list of string) REPOPATH = hd args; args = tl args; - arg->init(args); utils->init(REPOPATH); deflate->init(); parents: list of string = nil; - sha := arg->arg(); - while((c := arg->opt()) != 0) - { - case c - { + sha := hd args; + arg->init(args); + + while((c := arg->opt()) != 0){ + case c{ 'p' => parents = arg->arg() :: parents; * => usage(); return; } } - commit(sha, parents); + commit(sha, parents, arg->argv()); } -commit(treesha: string, parents: list of string): string +commit(treesha: string, parents: list of string, args: list of string): string { if(!utils->exists(treesha)){ sys->fprint(stderr, "no such tree file\n"); return ""; } - for(l := parents; l != nil; l = tl l){ if(!utils->exists(hd l)){ sys->fprint(stderr, "no such sha file: %s\n", hd l); @@ -100,15 +98,34 @@ commit(treesha: string, parents: list of string): string } config: ref Strhash[ref Config]; config = utils->getuserinfo(); - authorname := env->getenv("AUTHOR_NAME"); - authoremail := env->getenv("AUTHOR_EMAIL"); - authordate := env->getenv("AUTHOR_DATE"); + + authorname := hd args; + args = tl args; + + authoremail := hd args; + args = tl args; - if(authorname == "" || authoremail == ""){ - (authorname, authoremail) = getpersoninfo("author"); - } + authordate := hd args; + args = tl args; - (comname, comemail) := getpersoninfo("committer"); + comname := hd args; + args = tl args; + + comemail := hd args; + args = tl args; + +# authorname := env->getenv("AUTHOR_NAME"); +# authoremail := env->getenv("AUTHOR_EMAIL"); +# authordate := env->getenv("AUTHOR_DATE"); +# +# if(authorname == "" || authoremail == ""){ +# (authorname, authoremail) = getpersoninfo("author"); +# } +# +# (comname, comemail) := (config.find("user"), config.find("email"));); +# if(comname == "" || comemail == ""){ +# (comname, comemail) = getpersoninfo("committer"); +# } date := daytime->time(); if(authordate == "") @@ -117,7 +134,12 @@ commit(treesha: string, parents: list of string): string commitmsg += "author " + authorname + " <" + authoremail + "> " + authordate + "\n"; commitmsg += "committer " + comname + " <" + comemail + "> " + date + "\n\n"; - commitmsg += getcomment(); + while(args != nil){ + commitmsg += hd args; + args = tl args; + } +# commitmsg += getcomment(); + commitlen := int2string(len commitmsg); #6 - "commit", 1 - " ", 1 - '\0' @@ -137,9 +159,13 @@ commit(treesha: string, parents: list of string): string ch <-= (0, buf); (sz, sha) = <-ch; - fd := sys->open(REPOPATH + "head", Sys->OWRITE); - sys->fprint(fd, "%s", treesha); - return sha2string(sha); + fd := sys->create(REPOPATH + "head", Sys->OWRITE, 8r644); + + ret := sha2string(sha); + + sys->fprint(fd, "%s", ret); + + return ret; } @@ -149,6 +175,7 @@ getpersoninfo(pos: string): (string, string) ibuf := bufio->fopen(sys->fildes(0), bufio->OREAD); sys->print("Enter %s's name: ", pos); + buf := array[128] of byte; name := readline(ibuf); sys->print("Enter %s's email: ", pos); commit-tree.b @@ -1,5 +1,6 @@ Committree: module { + PATH: con "/dis/git/commit-tree.dis"; init: fn(args: list of string); }; commit-tree.m @@ -1,5 +1,6 @@ Difftree: module { + PATH: con "/dis/git/diff-tree.dis"; init: fn(args: list of string); }; diff-tree.m @@ -34,8 +34,12 @@ REPOPATH: string; Index.new(repopath: string): ref Index { - tables = load Tables Tables->PATH; sys = load Sys Sys->PATH; + tables = load Tables Tables->PATH; + if(tables == nil){ + sys->print("tables is nil: %r\n"); + + } utils = load Utils Utils->PATH; keyring = load Keyring Keyring->PATH; exclude = load Exclude Exclude->PATH; @@ -155,7 +159,7 @@ Header.new(): ref Header #return: number of elements read from index file Index.readindex(index: self ref Index, path : string) : int { - indexfd := sys->open(path, Sys->OREAD); + indexfd := sys->open(REPOPATH + path, Sys->OREAD); if(indexfd == nil){ sys->fprint(stderr,"file access error: %r\n"); @@ -222,7 +226,7 @@ Index.readindex(index: self ref Index, path : string) : int #return: number of elements written to the index file Index.writeindex(index: self ref Index, path : string) : int { - fd := sys->create(path, Sys->OWRITE, 8r644); + fd := sys->create(REPOPATH + path, Sys->OWRITE, 8r644); if(fd == nil){ sys->fprint(stderr, "write index error: %r\n"); return 0; @@ -254,8 +258,7 @@ Index.writeindex(index: self ref Index, path : string) : int entrybuf = (hd l).unpack(); cnt := sys->write(fd, entrybuf, len entrybuf); - if(cnt != len entrybuf) - { + if(cnt != len entrybuf){ sys->print("couldn't write entry to the file: %r\n"); return cnt; } @@ -407,7 +410,7 @@ initentry(filename: string): ref Entry { entry: Entry; - (retval, dirstat) := sys->stat(filename); + (retval, dirstat) := sys->stat(REPOPATH + filename); if(retval != 0) { sys->fprint(stderr,"stat error: %r\n"); gitindex.b @@ -54,12 +54,15 @@ showlog(commits: list of string) if(filetype != "commit") return showlog(commits); + msgchan <-= sys->aprint("Commit: %s\n", sha1); + ibuf := bufio->aopen(buf); #reading tree and throwing it away(maybe it can be used in the future). ibuf.gets('\n'); + while((s := ibuf.gets('\n')) != nil){ (t, parentsha1) := splitr(s, " "); if(t != "parent ") log.b @@ -28,6 +28,9 @@ include "cat-file.m"; include "readdir.m"; readdir: Readdir; +include "lists.m"; + lists: Lists; + include "tables.m"; tables: Tables; Strhash: import tables; @@ -36,6 +39,23 @@ include "init.m"; initmod: Initgit; include "update-index.m"; + indexmod: Updateindex; + +include "write-tree.m"; + +include "read-tree.m"; + +include "show-diff.m"; + +include "diff-tree.m"; + +include "commit-tree.m"; + +include "checkrepo.m"; + +include "checkout-index.m"; + +include "workdir.m"; repopath: string; @@ -67,18 +87,20 @@ init(nil: ref Draw->Context, args: list of string) { sys = load Sys Sys->PATH; daytime = load Daytime Daytime->PATH; + lists = load Lists Lists->PATH; tables = load Tables Tables->PATH; stringmod = load String String->PATH; log = load Log Log->PATH; catfile = load Catfile Catfile->PATH; readdir = load Readdir Readdir->PATH; initmod = load Initgit Initgit->PATH; + indexmod = load Updateindex Updateindex->PATH; if(len args != 2) usage(); - REPOPATH = hd (tl args); + REPOPATH = makeabsolute(hd (tl args)); repopath = REPOPATH; if(REPOPATH[len REPOPATH - 1] != '/'){ REPOPATH += "/"; @@ -235,6 +257,7 @@ mainloop: item1 := table.find(string fid.path); item2 := table.find(string item1.parentqid); + sys->print("myfs: reading file under objects\n"); #if objects is git object;FIXME: should be added code for checking zlib header if(item2 != nil && item2.parentqid == big QRootObjects){ path := item2.dirstat.name + item1.dirstat.name; @@ -281,27 +304,56 @@ ctl(m: ref Tmsg.Write) if(s != nil) s = s[1:]; + args: list of string = nil; + elem: string; + while(s != ""){ + (elem, s) = stringmod->splitl(s, " "); + sys->print("==>%s\n", elem); + args = elem :: args; + if(s != nil) + s = s[1:]; + } + args = lists->reverse(args); case command{ "init" => sys->print("init\n"); - initmod := load Initgit "/dis/git/init.dis"; - if(initmod == nil){ - sys->print("initmod load failed: %r\n"); - } spawn initmod->init(REPOPATH :: nil); "add" => sys->print("add\n"); - indexmod := load Updateindex Updateindex->PATH; - l: list of string = nil; - elem: string; - while(s != ""){ - (elem, s) = stringmod->splitl(s, " "); - l = elem :: l; - if(s != nil) - s = s[1:]; - } - spawn indexmod->init(REPOPATH :: "-a" ::l); + spawn indexmod->init(REPOPATH :: "-a" ::args); + + "print" => sys->print("print\n"); + spawn indexmod->init(REPOPATH :: nil); "remove" => sys->print("remove\n"); + spawn indexmod->init(REPOPATH :: "-r" :: args); + + "show-diff" => sys->print("show-diff\n"); + showdiff := load Showdiff Showdiff->PATH; + spawn showdiff->init(REPOPATH :: nil); + + "write-tree" => sys->print("write-tree\n"); + writetree := load Writetree Writetree->PATH; + spawn writetree->init(REPOPATH :: nil); + + "read-tree" => sys->print("read-tree\n"); + readtree := load Readtree Readtree->PATH; + readtree->init(REPOPATH :: args); + + "checkrepo" => sys->print("checkrepo\n"); + checkrepo := load Checkrepo Checkrepo->PATH; + checkrepo->init(REPOPATH :: args); + + "checkoutindex" => sys->print("checkoutindex\n"); + checkoutindex := load Checkoutindex Checkoutindex->PATH; + checkoutindex->init(REPOPATH :: args); + + "diff-tree" => sys->print("diff-tree\n"); + difftree := load Difftree Difftree->PATH; + difftree->init(REPOPATH :: args); + + "commit" => sys->print("commit\n"); + committree := load Committree Committree->PATH; + committree->init(REPOPATH :: args); * => sys->print("default\n"); } } @@ -403,3 +455,19 @@ usage() sys->fprint(sys->fildes(2), "mount {myfs dir} mntpt"); exit; } + +makeabsolute(path: string): string +{ + if(path == "" || path[0] == '/') return path; + + gwd := load Workdir Workdir->PATH; + pwd := gwd->init(); + + if(path[0] == '.'){ + if(len path <= 2) + return pwd; + return pwd + path[2:]; + } + + return pwd + "/" + path; +} myfs.b @@ -1,6 +1,7 @@ Readtree: module { + PATH: con "/dis/git/read-tree.dis"; init: fn(args: list of string); }; read-tree.m @@ -42,7 +42,7 @@ init(args: list of string) REPOPATH = hd args; utils->init(REPOPATH); index = Index.new(REPOPATH); - index.readindex(REPOPATH + utils->INDEXPATH); + index.readindex(utils->INDEXPATH); stderr = sys->fildes(2); showdiffs(); } @@ -60,7 +60,7 @@ showdiffs() filechanged(entry: ref Entry): int { sys->print("name is: %s\n", entry.name); - (ret, dirstat) := sys->stat(entry.name); + (ret, dirstat) := sys->stat(REPOPATH + entry.name); if(ret == -1){ sys->fprint(stderr, "File stat failed: %r\n"); return 0; @@ -75,5 +75,5 @@ showdiff(entry: ref Entry) { #loads acme-sac diff diff = load Command "/dis/git/acdiff.dis"; - diff->init(nil, list of {"diff", "-u",utils->extractfile(utils->sha2string(entry.sha1)), entry.name}); + diff->init(nil, list of {"diff", "-u",utils->extractfile(utils->sha2string(entry.sha1)), REPOPATH + entry.name}); } show-diff.b @@ -1,5 +1,6 @@ Showdiff: module { + PATH: con "/dis/git/show-diff.dis"; init: fn(args: list of string); }; show-diff.m @@ -1,5 +1,5 @@ Tables: module { - PATH: con "tables.dis"; + PATH: con "/dis/git/tables.dis"; Table: adt[T] { items: array of list of (int, T); nilval: T; tables.m @@ -38,6 +38,9 @@ init(args: list of string) { sys = load Sys Sys->PATH; gitindex = load Gitindex Gitindex->PATH; + if(gitindex == nil){ + sys->print("gitindex is nil %r\n"); + } tables = load Tables Tables->PATH; readdir = load Readdir Readdir->PATH; @@ -45,7 +48,7 @@ init(args: list of string) stderr = sys->fildes(2); sys->create(REPOPATH + "index.lock", Sys->OWRITE | Sys->OEXCL, Sys->DMEXCL | 8r644); index = Index.new(REPOPATH); - cnt := index.readindex(REPOPATH + INDEXPATH); + cnt := index.readindex(INDEXPATH); if(cnt < 0) return; @@ -57,7 +60,6 @@ init(args: list of string) addfile(hd args); args = tl args; } - } else if(args != nil && hd args == "-r"){ args = tl args; @@ -70,7 +72,7 @@ init(args: list of string) printindex(index); sys->print("Writing to index\n"); - index.writeindex(REPOPATH + "index.lock"); + index.writeindex("index.lock"); #renaming index.lock to index dirstat := sys->nulldir; @@ -86,21 +88,20 @@ printindex(index: ref Index) { table := index.entries; if(table == nil) sys->print("its nill\n"); - for( l := table.all(); l != nil; l = tl l) - { - sys->print("Name: %s\n", (hd l).name); - sys->print("Length: %bd\n", (hd l).length); + for(l := table.all(); l != nil; l = tl l){ + sys->print("Name:%s\n", (hd l).name); + sys->print("Length:%bd\n", (hd l).length); } } addfile(path: string) { - (ret, dirstat) := sys->stat(path); + (ret, dirstat) := sys->stat(REPOPATH + path); if(ret == -1) sys->fprint(stderr, "%s does not exist\n", path); if(dirstat.mode & Sys->DMDIR) { - (dirs,cnt) := readdir->init(path,Readdir->NAME); + (dirs,cnt) := readdir->init(REPOPATH + path,Readdir->NAME); if(path[len path - 1] != '/') path += "/"; update-index.b @@ -361,3 +361,12 @@ isdir(mode: int): int { return mode & 16384; } + +bytepos(a: array of byte, offset: int, delim: byte): int +{ + for(i := offset; i < len a; i++){ + if(a[i] == delim) + return i; + } + return -1; +} utils.b @@ -51,6 +51,7 @@ Utils: module warn: fn(s: string); isdir: fn(mode: int): int; + bytepos: fn(a: array of byte, offset: int, delim: byte): int; }; utils.m @@ -1,5 +1,6 @@ Writetree: module { + PATH: con "/dis/git/write-tree.dis"; init: fn(args: list of string); }; write-tree.m 228807b282ba5c36bcdd44ed085907e6bb14eb37 Manzur manzur@UCB.(none) http://github.com/manzur/gitfs/commit/f505ff91eec342b34604853e87a6d217db9f6112 f505ff91eec342b34604853e87a6d217db9f6112 2009-06-25T12:22:44-07:00 2009-06-25T12:22:44-07:00 - Added special case to cat for reading trees: sha of the files are showed as text. - Fixed bug in checkout-index: path didn't included REPOPATH. - Added interface between filesytem and checkrepo, checkoutindex, commit-tree, show-diff, read-tree, write-tree, diff-tree 35b865e6f5f9dcb4c2d885730e4f566941317258 Manzur manzur@UCB.(none)