threads / patch / 24569

patch, 3 partssvn-fe fixes

Subject: [PATCH 0/3] svn-fe fixes

## tl;dr

4 messages between Jul 29, 2010 and Jul 29, 2010. Diffs are folded; open one to read it.

replies: 3people: 1as markdown or json

Ramkumar Ramachandra· Jul 29, 2010, 05:36 UTC · lore

Hi,

My first patch removes a few function calls that Jonathan forgot to remove while turning off persistence- those functions aren't generated by the obj_pool.h merged into `pu` (Commit fd94590214). My second patch fixes the IncludePath in the Makefile so that svn-fe.h is able to find the specified header. My third patch is just a trivial patch to add /svn-fe to the .gitignore.

I'm sorry I didn't catch this earlier- I only just noticed that the version merged into `pu` wasn't exactly the version I was basing my work on, so I grafted out the commits and rebased to find these problems. In the meantime, I'd request everyone to try out svn-fe in `pu`- I'm soon going to send in more patches that are based on what's already merged.

Thanks.

-- Ram

Ramkumar Ramachandra (3):
  vcs-svn: Remove stray calls to removed functions
  contrib/svn-fe: Fix IncludePath
  contrib/svn-fe: Add the svn-fe target to .gitignore

 contrib/svn-fe/.gitignore |    1 +
 contrib/svn-fe/Makefile   |    2 +-
 contrib/svn-fe/svn-fe.c   |    2 +-
 vcs-svn/repo_tree.c       |    3 ---
 vcs-svn/string_pool.c     |    1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

Ramkumar Ramachandra· Jul 29, 2010, 05:36 UTC · re: Ramkumar Ramachandra · lore

[PATCH 1/3] vcs-svn: Remove stray calls to removed functions

repo_tree.c makes calls to non-existant commit_init, dir_init and dirent_init functions, and string_pool.c makes a call to non-existant string_init function. These functions were previously generated in obj_pool.h before persistence in svn-fe was turned off.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 vcs-svn/repo_tree.c   |    3 ---
 vcs-svn/string_pool.c |    1 -
 2 files changed, 0 insertions(+), 4 deletions(-)

Show changes to 2 files +0 −4

vcs-svn/repo_tree.c, vcs-svn/string_pool.c

diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index c27d077..1ce184d 100644
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -308,9 +308,6 @@ static void mark_init(void)
 
 void repo_init() {
 	pool_init();
-	commit_init();
-	dir_init();
-	dirent_init();
 	mark_init();
 	if (commit_pool.size == 0) {
 		/* Create empty tree for commit 0. */
diff --git a/vcs-svn/string_pool.c b/vcs-svn/string_pool.c
index bd5a380..616b17e 100644
--- a/vcs-svn/string_pool.c
+++ b/vcs-svn/string_pool.c
@@ -93,7 +93,6 @@ void pool_init(void)
 {
 	uint32_t node;
 	uint32_t string = 0;
-	string_init();
 	while (string < string_pool.size) {
 		node = node_alloc(1);
 		node_pointer(node)->offset = string;

-- 
1.7.1

Ramkumar Ramachandra· Jul 29, 2010, 05:36 UTC · re: Ramkumar Ramachandra · lore

[PATCH 2/3] contrib/svn-fe: Fix IncludePath

Include the path "../../vcs-svn" while compiling it in the Makefile and change svn-fe.c to include svndump.h.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 contrib/svn-fe/Makefile |    2 +-
 contrib/svn-fe/svn-fe.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Show changes to 2 files +2 −2

contrib/svn-fe/Makefile, contrib/svn-fe/svn-fe.c

diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
index 4cc8d15..360d8da 100644
--- a/contrib/svn-fe/Makefile
+++ b/contrib/svn-fe/Makefile
@@ -38,7 +38,7 @@ svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(GIT_LIB)
 		$(ALL_LDFLAGS) $(LIBS)
 
 svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h
-	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $<
+	$(QUIET_CC)$(CC) -I../../vcs-svn -o $*.o -c $(ALL_CFLAGS) $<
 
 svn-fe.html: svn-fe.txt
 	$(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
index 43c4320..e9b9ba4 100644
--- a/contrib/svn-fe/svn-fe.c
+++ b/contrib/svn-fe/svn-fe.c
@@ -4,7 +4,7 @@
  */
 
 #include <stdlib.h>
-#include "vcs-svn/svndump.h"
+#include "svndump.h"
 
 int main(int argc, char **argv)
 {

-- 
1.7.1

Ramkumar Ramachandra· Jul 29, 2010, 05:36 UTC · re: Ramkumar Ramachandra · lore

[PATCH 3/3] contrib/svn-fe: Add the svn-fe target to .gitignore

Add the svn-fe target to .gitignroe.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 contrib/svn-fe/.gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Show changes to contrib/svn-fe/.gitignore +1 −0

diff --git a/contrib/svn-fe/.gitignore b/contrib/svn-fe/.gitignore
index 27a33b6..02a7791 100644
--- a/contrib/svn-fe/.gitignore
+++ b/contrib/svn-fe/.gitignore
@@ -1,3 +1,4 @@
 /*.xml
 /*.1
 /*.html
+/svn-fe

-- 
1.7.1