Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
vcs-svn: Make source easier to read on small screens
author
Jonathan Nieder
<jrnieder@gmail.com>
Sat, 20 Nov 2010 00:53:54 +0000
(18:53 -0600)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 24 Nov 2010 22:53:58 +0000
(14:53 -0800)
Remove some newlines from handle_node() that are not needed for
clarity.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
vcs-svn/svndump.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c7dbf35
)
diff --git
a/vcs-svn/svndump.c
b/vcs-svn/svndump.c
index ab4ccfc55fbd88750a5787d64e918c866c478aae..153b0c337d718686212614cbe7cfa248fd8866a5 100644
(file)
--- a/
vcs-svn/svndump.c
+++ b/
vcs-svn/svndump.c
@@
-156,31
+156,25
@@
static void handle_node(void)
if (node_ctx.text_delta || node_ctx.prop_delta)
die("text and property deltas not supported");
if (node_ctx.text_delta || node_ctx.prop_delta)
die("text and property deltas not supported");
-
if (node_ctx.textLength != LENGTH_UNKNOWN)
mark = next_blob_mark();
if (node_ctx.textLength != LENGTH_UNKNOWN)
mark = next_blob_mark();
-
if (node_ctx.action == NODEACT_DELETE) {
if (mark || have_props || node_ctx.srcRev)
die("invalid dump: deletion node has "
"copyfrom info, text, or properties");
return repo_delete(node_ctx.dst);
}
if (node_ctx.action == NODEACT_DELETE) {
if (mark || have_props || node_ctx.srcRev)
die("invalid dump: deletion node has "
"copyfrom info, text, or properties");
return repo_delete(node_ctx.dst);
}
-
if (node_ctx.action == NODEACT_REPLACE) {
repo_delete(node_ctx.dst);
node_ctx.action = NODEACT_ADD;
}
if (node_ctx.action == NODEACT_REPLACE) {
repo_delete(node_ctx.dst);
node_ctx.action = NODEACT_ADD;
}
-
if (node_ctx.srcRev) {
repo_copy(node_ctx.srcRev, node_ctx.src, node_ctx.dst);
if (node_ctx.action == NODEACT_ADD)
node_ctx.action = NODEACT_CHANGE;
}
if (node_ctx.srcRev) {
repo_copy(node_ctx.srcRev, node_ctx.src, node_ctx.dst);
if (node_ctx.action == NODEACT_ADD)
node_ctx.action = NODEACT_CHANGE;
}
-
if (mark && type == REPO_MODE_DIR)
die("invalid dump: directories cannot have text attached");
if (mark && type == REPO_MODE_DIR)
die("invalid dump: directories cannot have text attached");
-
if (node_ctx.action == NODEACT_CHANGE) {
uint32_t mode = repo_modify_path(node_ctx.dst, 0, mark);
if (!mode)
if (node_ctx.action == NODEACT_CHANGE) {
uint32_t mode = repo_modify_path(node_ctx.dst, 0, mark);
if (!mode)
@@
-197,7
+191,6
@@
static void handle_node(void)
} else {
die("invalid dump: Node-path block lacks Node-action");
}
} else {
die("invalid dump: Node-path block lacks Node-action");
}
-
if (have_props) {
const uint32_t old_mode = node_ctx.type;
node_ctx.type = type;
if (have_props) {
const uint32_t old_mode = node_ctx.type;
node_ctx.type = type;
@@
-206,7
+199,6
@@
static void handle_node(void)
if (node_ctx.type != old_mode)
repo_modify_path(node_ctx.dst, node_ctx.type, mark);
}
if (node_ctx.type != old_mode)
repo_modify_path(node_ctx.dst, node_ctx.type, mark);
}
-
if (mark)
fast_export_blob(node_ctx.type, mark, node_ctx.textLength);
}
if (mark)
fast_export_blob(node_ctx.type, mark, node_ctx.textLength);
}