From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Aug 2017 22:09:38 +0000 (-0700)
Subject: Merge branch 'bc/vcs-svn-cleanup' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d8494b5d5b25e24f70e9818958c0d79e9d211f58?hp=-c

Merge branch 'bc/vcs-svn-cleanup' into next

Code clean-up.

* bc/vcs-svn-cleanup:
vcs-svn: rename repo functions to "svn_repo"
vcs-svn: remove unused prototypes
---

d8494b5d5b25e24f70e9818958c0d79e9d211f58
diff --combined vcs-svn/svndump.c
index 1846685a21,7da84b2aab..37c4a36b92
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@@ -47,7 -47,7 +47,7 @@@ static struct 
  
  static struct {
  	uint32_t revision;
 -	unsigned long timestamp;
 +	timestamp_t timestamp;
  	struct strbuf log, author, note;
  } rev_ctx;
  
@@@ -225,15 -225,15 +225,15 @@@ static void handle_node(void
  		if (have_text || have_props || node_ctx.srcRev)
  			die("invalid dump: deletion node has "
  				"copyfrom info, text, or properties");
- 		repo_delete(node_ctx.dst.buf);
+ 		svn_repo_delete(node_ctx.dst.buf);
  		return;
  	}
  	if (node_ctx.action == NODEACT_REPLACE) {
- 		repo_delete(node_ctx.dst.buf);
+ 		svn_repo_delete(node_ctx.dst.buf);
  		node_ctx.action = NODEACT_ADD;
  	}
  	if (node_ctx.srcRev) {
- 		repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
+ 		svn_repo_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
  		if (node_ctx.action == NODEACT_ADD)
  			node_ctx.action = NODEACT_CHANGE;
  	}
@@@ -249,7 -249,7 +249,7 @@@
  		old_data = NULL;
  	} else if (node_ctx.action == NODEACT_CHANGE) {
  		uint32_t mode;
- 		old_data = repo_read_path(node_ctx.dst.buf, &mode);
+ 		old_data = svn_repo_read_path(node_ctx.dst.buf, &mode);
  		if (mode == REPO_MODE_DIR && type != REPO_MODE_DIR)
  			die("invalid dump: cannot modify a directory into a file");
  		if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR)