path: root/vcs-svn/svndump.c
diff options
authorDavid Barr <>2010-12-13 06:09:31 (GMT)
committerJonathan Nieder <>2011-03-26 06:00:05 (GMT)
commit43155cfe1415f5547791613a5de6399112ba3560 (patch)
tree0c94aacd3fad3b87be441927b7a349fe6e6335d9 /vcs-svn/svndump.c
parentdd3f42ad793b5334d506a451addcefd0054c27bb (diff)
vcs-svn: avoid using ls command twice
Currently there are two functions to retrieve the mode and content at a path: const char *repo_read_path(const uint32_t *path); uint32_t repo_read_mode(const uint32_t *path) Replace them with a single function with two return values. This means we can use one round-trip to get the same information from fast-import that previously took two. Signed-off-by: David Barr <> Signed-off-by: Jonathan Nieder <>
Diffstat (limited to 'vcs-svn/svndump.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index 7ecb227..99a5ba0 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -246,8 +246,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);
- mode = repo_read_mode(node_ctx.dst);
+ old_data = repo_read_path(node_ctx.dst, &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)