mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 12:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

vcs-svn: avoid using ls command twice

Browse Source 
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>
This commit is contained in:
David Barr 2010-12-13 17:09:31 +11:00 committed by Jonathan Nieder
parent dd3f42ad79
commit 43155cfe14
3 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vcs-svn/repo_tree.c
View File

@ -8,37 +8,21 @@
#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);
if (err) {
if (errno != ENOENT)
die_errno("BUG: unexpected fast_export_ls error");
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);
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. */
return REPO_MODE_DIR;
*mode_out = REPO_MODE_DIR;
return NULL;
}
return result;
return buf.buf;
}
void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst)

3
vcs-svn/repo_tree.h
View File

@ -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);

3
vcs-svn/svndump.c
View File

@ -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)