summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Barr <david.barr@cordelta.com>2010-12-13 06:09:31 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2011-03-26 06:00:05 (GMT)
commit43155cfe1415f5547791613a5de6399112ba3560 (patch)
tree0c94aacd3fad3b87be441927b7a349fe6e6335d9
parentdd3f42ad793b5334d506a451addcefd0054c27bb (diff)
downloadgit-43155cfe1415f5547791613a5de6399112ba3560.zip
git-43155cfe1415f5547791613a5de6399112ba3560.tar.gz
git-43155cfe1415f5547791613a5de6399112ba3560.tar.bz2
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 <david.barr@cordelta.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
-rw-r--r--vcs-svn/repo_tree.c24
-rw-r--r--vcs-svn/repo_tree.h3
-rw-r--r--vcs-svn/svndump.c3
3 files changed, 6 insertions, 24 deletions
diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index e75f580..1681b65 100644
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -8,39 +8,23 @@
#include "repo_tree.h"
#include "fast_export.h"
-const char *repo_read_path(const uint32_t *path)
+const char *repo_read_path(const uint32_t *path, uint32_t *mode_out)
{
int err;
- uint32_t dummy;
static struct strbuf buf = STRBUF_INIT;
strbuf_reset(&buf);
- err = fast_export_ls(REPO_MAX_PATH_DEPTH, path, &dummy, &buf);
+ err = fast_export_ls(REPO_MAX_PATH_DEPTH, path, mode_out, &buf);
if (err) {
if (errno != ENOENT)
die_errno("BUG: unexpected fast_export_ls error");
+ /* Treat missing paths as directories. */
+ *mode_out = REPO_MODE_DIR;
return NULL;
}
return buf.buf;
}
-uint32_t repo_read_mode(const uint32_t *path)
-{
- int err;
- uint32_t result;
- static struct strbuf dummy = STRBUF_INIT;
-
- strbuf_reset(&dummy);
- err = fast_export_ls(REPO_MAX_PATH_DEPTH, path, &result, &dummy);
- if (err) {
- if (errno != ENOENT)
- die_errno("BUG: unexpected fast_export_ls error");
- /* Treat missing paths as directories. */
- return REPO_MODE_DIR;
- }
- return result;
-}
-
void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst)
{
int err;
diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h
index d690784..f506352 100644
--- a/vcs-svn/repo_tree.h
+++ b/vcs-svn/repo_tree.h
@@ -14,8 +14,7 @@
uint32_t next_blob_mark(void);
void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst);
void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark);
-const char *repo_read_path(const uint32_t *path);
-uint32_t repo_read_mode(const uint32_t *path);
+const char *repo_read_path(const uint32_t *path, uint32_t *mode_out);
void repo_delete(uint32_t *path);
void repo_commit(uint32_t revision, uint32_t author, char *log, uint32_t uuid,
uint32_t url, long unsigned timestamp);
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)