- 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

Author: Manzur

cat-file.b

@@ -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()

checkout-index.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.m

@@ -1,6 +1,7 @@
 
 Checkoutindex: module
 {
+	PATH: con "/dis/git/checkout-index.dis";
 	init: fn(args: list of string);
 };
 

checkrepo.b

@@ -56,7 +56,7 @@ init(args: list of string)
 
 check()
 {
-	readrepo(OBJECTSTOREPATH);
+	readrepo(REPOPATH + OBJECTSTOREPATH);
 
 	cnt := 0;
 	for(i := 0; i < HASHSZ; i++){

checkrepo.m

@@ -1,5 +1,6 @@
 Checkrepo: module
 {
+	PATH: con "/dis/git/checkrepo.dis";
 	init: fn(args: list of string);
 };
 

commit-tree.b

@@ -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.m

@@ -1,5 +1,6 @@
 
 Committree: module
 {
+	PATH: con "/dis/git/commit-tree.dis";
 	init: fn(args: list of string);
 };

diff-tree.m

@@ -1,5 +1,6 @@
 
 Difftree: module
 {
+	PATH: con "/dis/git/diff-tree.dis";
 	init: fn(args: list of string);
 };

gitindex.b

@@ -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");

log.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 ")