diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:03:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:03:08 +0900 |
| commit | 044aa0eb7fa44f0f2d44c3331d6218e087b45fc2 (patch) | |
| tree | 11d4a0801d6346361af781c7e0333fd9ece02cd5 /vcs-svn/svndump.c | |
| parent | 5e03ae4594358b3ab71cf98f18b4ccb18af99e6d (diff) | |
| parent | 15d1d0951e60903263f90af912738ad60ac43bb5 (diff) | |
Merge branch 'bc/vcs-svn-cleanup' into maint
Code clean-up.
* bc/vcs-svn-cleanup:
vcs-svn: rename repo functions to "svn_repo"
vcs-svn: remove unused prototypes
Diffstat (limited to 'vcs-svn/svndump.c')
| -rw-r--r-- | vcs-svn/svndump.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index 1846685a21..37c4a36b92 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -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 @@ static void handle_node(void) 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) |