undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vcs-svn: remove custom mode constants

Browse Source 
In the rest of Git, these modes are spelled as S_IFDIR,
S_IFREG | 0644, S_IFREG | 0755, and S_IFLNK.  Use the same constants
in svn-fe for simplicity and consistency.

No functional change intended.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2017-08-22 17:01:34 -07:00 committed by Junio C Hamano
parent 40222792fa
commit 21c7c2d92d
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcs-svn/fast_export.c
View File

@ -210,7 +210,7 @@ static long apply_delta(off_t len, struct line_buffer *input,
die("invalid cat-blob response: %s", response); die("invalid cat-blob response: %s", response);
check_preimage_overflow(preimage.max_off, 1); check_preimage_overflow(preimage.max_off, 1);
} }
if (old_mode == REPO_MODE_LNK) { if (old_mode == S_IFLNK) {
strbuf_addstr(&preimage.buf, "link "); strbuf_addstr(&preimage.buf, "link ");
check_preimage_overflow(preimage.max_off, strlen("link ")); check_preimage_overflow(preimage.max_off, strlen("link "));
preimage.max_off += strlen("link "); preimage.max_off += strlen("link ");
@ -244,7 +244,7 @@ void fast_export_buf_to_data(const struct strbuf *data)
void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input) void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input)
{ {
assert(len >= 0); assert(len >= 0);
if (mode == REPO_MODE_LNK) { if (mode == S_IFLNK) {
/* svn symlink blobs start with "link " */ /* svn symlink blobs start with "link " */
if (len < 5) if (len < 5)
die("invalid dump: symlink too short for \"link\" prefix"); die("invalid dump: symlink too short for \"link\" prefix");
@ -320,7 +320,7 @@ void fast_export_blob_delta(uint32_t mode,
assert(len >= 0); assert(len >= 0);
postimage_len = apply_delta(len, input, old_data, old_mode); postimage_len = apply_delta(len, input, old_data, old_mode);
if (mode == REPO_MODE_LNK) { if (mode == S_IFLNK) {
buffer_skip_bytes(&postimage, strlen("link ")); buffer_skip_bytes(&postimage, strlen("link "));
postimage_len -= strlen("link "); postimage_len -= strlen("link ");
} }

2
vcs-svn/repo_tree.c
View File

@ -19,7 +19,7 @@ const char *svn_repo_read_path(const char *path, uint32_t *mode_out)
if (errno != ENOENT) if (errno != ENOENT)
die_errno("BUG: unexpected fast_export_ls error"); die_errno("BUG: unexpected fast_export_ls error");
/* Treat missing paths as directories. */ /* Treat missing paths as directories. */
*mode_out = REPO_MODE_DIR; *mode_out = S_IFDIR;
return NULL; return NULL;
} }
return buf.buf; return buf.buf;

5
vcs-svn/repo_tree.h
View File

@ -1,11 +1,6 @@
#ifndef REPO_TREE_H_ #ifndef REPO_TREE_H_
#define REPO_TREE_H_ #define REPO_TREE_H_
#define REPO_MODE_DIR 0040000
#define REPO_MODE_BLB 0100644
#define REPO_MODE_EXE 0100755
#define REPO_MODE_LNK 0120000
void svn_repo_copy(uint32_t revision, const char *src, const char *dst); 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); const char *svn_repo_read_path(const char *path, uint32_t *mode_out);
void svn_repo_delete(const char *path); void svn_repo_delete(const char *path);

24
vcs-svn/svndump.c
View File

@ -134,13 +134,13 @@ static void handle_property(const struct strbuf *key_buf,
die("invalid dump: sets type twice"); die("invalid dump: sets type twice");
} }
if (!val) { if (!val) {
node_ctx.type = REPO_MODE_BLB; node_ctx.type = S_IFREG | 0644;
return; return;
} }
*type_set = 1; *type_set = 1;
node_ctx.type = keylen == strlen("svn:executable") ? node_ctx.type = keylen == strlen("svn:executable") ?
REPO_MODE_EXE : (S_IFREG | 0755) :
REPO_MODE_LNK; S_IFLNK;
} }
} }
@ -219,7 +219,7 @@ static void handle_node(void)
*/ */
static const char *const empty_blob = "::empty::"; static const char *const empty_blob = "::empty::";
const char *old_data = NULL; const char *old_data = NULL;
uint32_t old_mode = REPO_MODE_BLB; uint32_t old_mode = S_IFREG | 0644;
if (node_ctx.action == NODEACT_DELETE) { if (node_ctx.action == NODEACT_DELETE) {
if (have_text || have_props || node_ctx.srcRev) if (have_text || have_props || node_ctx.srcRev)
@ -237,27 +237,27 @@ static void handle_node(void)
if (node_ctx.action == NODEACT_ADD) if (node_ctx.action == NODEACT_ADD)
node_ctx.action = NODEACT_CHANGE; node_ctx.action = NODEACT_CHANGE;
} }
if (have_text && type == REPO_MODE_DIR) if (have_text && type == S_IFDIR)
die("invalid dump: directories cannot have text attached"); die("invalid dump: directories cannot have text attached");
/* /*
* Find old content (old_data) and decide on the new mode. * Find old content (old_data) and decide on the new mode.
*/ */
if (node_ctx.action == NODEACT_CHANGE && !*node_ctx.dst.buf) { if (node_ctx.action == NODEACT_CHANGE && !*node_ctx.dst.buf) {
if (type != REPO_MODE_DIR) if (type != S_IFDIR)
die("invalid dump: root of tree is not a regular file"); die("invalid dump: root of tree is not a regular file");
old_data = NULL; old_data = NULL;
} else if (node_ctx.action == NODEACT_CHANGE) { } else if (node_ctx.action == NODEACT_CHANGE) {
uint32_t mode; uint32_t mode;
old_data = svn_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) if (mode == S_IFDIR && type != S_IFDIR)
die("invalid dump: cannot modify a directory into a file"); die("invalid dump: cannot modify a directory into a file");
if (mode != REPO_MODE_DIR && type == REPO_MODE_DIR) if (mode != S_IFDIR && type == S_IFDIR)
die("invalid dump: cannot modify a file into a directory"); die("invalid dump: cannot modify a file into a directory");
node_ctx.type = mode; node_ctx.type = mode;
old_mode = mode; old_mode = mode;
} else if (node_ctx.action == NODEACT_ADD) { } else if (node_ctx.action == NODEACT_ADD) {
if (type == REPO_MODE_DIR) if (type == S_IFDIR)
old_data = NULL; old_data = NULL;
else if (have_text) else if (have_text)
old_data = empty_blob; old_data = empty_blob;
@ -280,7 +280,7 @@ static void handle_node(void)
/* /*
* Save the result. * Save the result.
*/ */
if (type == REPO_MODE_DIR) /* directories are not tracked. */ if (type == S_IFDIR) /* directories are not tracked. */
return; return;
assert(old_data); assert(old_data);
if (old_data == empty_blob) if (old_data == empty_blob)
@ -385,9 +385,9 @@ void svndump_read(const char *url, const char *local_ref, const char *notes_ref)
continue; continue;
strbuf_addf(&rev_ctx.note, "%s\n", t); strbuf_addf(&rev_ctx.note, "%s\n", t);
if (!strcmp(val, "dir")) if (!strcmp(val, "dir"))
node_ctx.type = REPO_MODE_DIR; node_ctx.type = S_IFDIR;
else if (!strcmp(val, "file")) else if (!strcmp(val, "file"))
node_ctx.type = REPO_MODE_BLB; node_ctx.type = S_IFREG | 0644;
else else
fprintf(stderr, "Unknown node-kind: %s\n", val); fprintf(stderr, "Unknown node-kind: %s\n", val);
break; break;