From 9b0db33506ea9b1d968d719f2fce9c208c66cd95 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 22 Aug 2017 17:02:15 -0700 Subject: [PATCH] vcs-svn: remove repo_delete wrapper function Since v1.7.10-rc0~118^2~4^2~4^2~3 (vcs-svn: pass paths through to fast-import, 2010-12-13) this is an alias for fast_export_delete. Remove the unnecessary layer of indirection. No functional change intended. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- vcs-svn/repo_tree.c | 5 ----- vcs-svn/repo_tree.h | 1 - vcs-svn/svndump.c | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c index 1a6f32d7cb..5bd4977cb6 100644 --- a/vcs-svn/repo_tree.c +++ b/vcs-svn/repo_tree.c @@ -41,8 +41,3 @@ void svn_repo_copy(uint32_t revision, const char *src, const char *dst) } fast_export_modify(dst, mode, data.buf); } - -void svn_repo_delete(const char *path) -{ - fast_export_delete(path); -} diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h index c840bc9bae..0cd2761183 100644 --- a/vcs-svn/repo_tree.h +++ b/vcs-svn/repo_tree.h @@ -3,6 +3,5 @@ void svn_repo_copy(uint32_t revision, const char *src, const char *dst); const char *svn_repo_read_path(const char *path, uint32_t *mode_out); -void svn_repo_delete(const char *path); #endif diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index c0fa4eb723..41113119bd 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -225,11 +225,11 @@ static void handle_node(void) if (have_text || have_props || node_ctx.srcRev) die("invalid dump: deletion node has " "copyfrom info, text, or properties"); - svn_repo_delete(node_ctx.dst.buf); + fast_export_delete(node_ctx.dst.buf); return; } if (node_ctx.action == NODEACT_REPLACE) { - svn_repo_delete(node_ctx.dst.buf); + fast_export_delete(node_ctx.dst.buf); node_ctx.action = NODEACT_ADD; } if (node_ctx.srcRev) { -- 2.11.4.GIT