vcs-svn: Make source easier to read on small screens
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>
Jonathan Nieder committed
Nov 19, 2010 at 18:53 UTC
3f3e676d6e6c1d445181107770670368e0ad3160
1 file changed
-8
vcs-svn/svndump.c
-8
@@ -156,31 +156,25 @@ static void handle_node(void)
156
157
if (node_ctx.text_delta || node_ctx.prop_delta)
158
die("text and property deltas not supported");
159
-
159
if (node_ctx.textLength != LENGTH_UNKNOWN)
160
mark = next_blob_mark();
162
-
161
if (node_ctx.action == NODEACT_DELETE) {
162
if (mark || have_props || node_ctx.srcRev)
163
die("invalid dump: deletion node has "
164
"copyfrom info, text, or properties");
165
return repo_delete(node_ctx.dst);
166
}
169
-
167
if (node_ctx.action == NODEACT_REPLACE) {
168
repo_delete(node_ctx.dst);
169
node_ctx.action = NODEACT_ADD;
170
}
174
-
171
if (node_ctx.srcRev) {
172
repo_copy(node_ctx.srcRev, node_ctx.src, node_ctx.dst);
173
if (node_ctx.action == NODEACT_ADD)
174
node_ctx.action = NODEACT_CHANGE;
175
}
180
-
176
if (mark && type == REPO_MODE_DIR)
177
die("invalid dump: directories cannot have text attached");
183
-
178
if (node_ctx.action == NODEACT_CHANGE) {
179
uint32_t mode = repo_modify_path(node_ctx.dst, 0, mark);
180
if (!mode)
@@ -197,7 +191,6 @@ static void handle_node(void)
191
} else {
192
die("invalid dump: Node-path block lacks Node-action");
193
}
200
-
194
if (have_props) {
195
const uint32_t old_mode = node_ctx.type;
196
node_ctx.type = type;
@@ -206,7 +199,6 @@ static void handle_node(void)
199
if (node_ctx.type != old_mode)
200
repo_modify_path(node_ctx.dst, node_ctx.type, mark);
201
}
209
-
202
if (mark)
203
fast_export_blob(node_ctx.type, mark, node_ctx.textLength);
204
}