X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=vcs-svn%2Frepo_tree.c;h=8caa0159d1f40e25303c5624ec7d17471435cf47;hb=195b7ca6f229455da61f9f6b6e56a6558fb0e8ee;hp=e3d1fa35444dd693ab8723a030b9fc6265cad8bc;hpb=0c30ed0cb57988378d721d817c55f74a93dffb13;p=git.git

diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index e3d1fa354..8caa0159d 100644
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -87,7 +87,8 @@ static struct repo_dir *repo_clone_dir(struct repo_dir *orig_dir)
 	return dir_pointer(new_o);
 }
 
-static struct repo_dirent *repo_read_dirent(uint32_t revision, uint32_t *path)
+static struct repo_dirent *repo_read_dirent(uint32_t revision,
+					    const uint32_t *path)
 {
 	uint32_t name = 0;
 	struct repo_dirent *key = dent_pointer(dent_alloc(1));
@@ -105,7 +106,7 @@ static struct repo_dirent *repo_read_dirent(uint32_t revision, uint32_t *path)
 	return dent;
 }
 
-static void repo_write_dirent(uint32_t *path, uint32_t mode,
+static void repo_write_dirent(const uint32_t *path, uint32_t mode,
 			      uint32_t content_offset, uint32_t del)
 {
 	uint32_t name, revision, dir_o = ~0, parent_dir_o = ~0;
@@ -157,42 +158,37 @@ static void repo_write_dirent(uint32_t *path, uint32_t mode,
 		dent_remove(&dir_pointer(parent_dir_o)->entries, dent);
 }
 
-uint32_t repo_copy(uint32_t revision, uint32_t *src, uint32_t *dst)
+uint32_t repo_read_path(const uint32_t *path)
 {
-	uint32_t mode = 0, content_offset = 0;
-	struct repo_dirent *src_dent;
-	src_dent = repo_read_dirent(revision, src);
-	if (src_dent != NULL) {
-		mode = src_dent->mode;
-		content_offset = src_dent->content_offset;
-		repo_write_dirent(dst, mode, content_offset, 0);
-	}
-	return mode;
+	uint32_t content_offset = 0;
+	struct repo_dirent *dent = repo_read_dirent(active_commit, path);
+	if (dent != NULL)
+		content_offset = dent->content_offset;
+	return content_offset;
 }
 
-void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark)
+uint32_t repo_read_mode(const uint32_t *path)
 {
-	repo_write_dirent(path, mode, blob_mark, 0);
+	struct repo_dirent *dent = repo_read_dirent(active_commit, path);
+	if (dent == NULL)
+		die("invalid dump: path to be modified is missing");
+	return dent->mode;
 }
 
-uint32_t repo_replace(uint32_t *path, uint32_t blob_mark)
+void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst)
 {
-	uint32_t mode = 0;
+	uint32_t mode = 0, content_offset = 0;
 	struct repo_dirent *src_dent;
-	src_dent = repo_read_dirent(active_commit, path);
+	src_dent = repo_read_dirent(revision, src);
 	if (src_dent != NULL) {
 		mode = src_dent->mode;
-		repo_write_dirent(path, mode, blob_mark, 0);
+		content_offset = src_dent->content_offset;
+		repo_write_dirent(dst, mode, content_offset, 0);
 	}
-	return mode;
 }
 
-void repo_modify(uint32_t *path, uint32_t mode, uint32_t blob_mark)
+void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark)
 {
-	struct repo_dirent *src_dent;
-	src_dent = repo_read_dirent(active_commit, path);
-	if (src_dent != NULL && blob_mark == 0)
-		blob_mark = src_dent->content_offset;
 	repo_write_dirent(path, mode, blob_mark, 0);
 }
 
@@ -282,8 +278,9 @@ void repo_diff(uint32_t r1, uint32_t r2)
 		    repo_commit_root_dir(commit_pointer(r2)));
 }
 
-void repo_commit(uint32_t revision, uint32_t author, char *log, uint32_t uuid,
-		 uint32_t url, unsigned long timestamp)
+void repo_commit(uint32_t revision, const char *author,
+		const struct strbuf *log, const char *uuid, const char *url,
+		unsigned long timestamp)
 {
 	fast_export_commit(revision, author, log, uuid, url, timestamp);
 	dent_commit();