2 * Parse and rearrange a svnadmin dump.
3 * Create the dump with:
4 * svnadmin dump --incremental -r<startrev>:<endrev> <repository> >outfile
6 * Licensed under a two-clause BSD-style license.
7 * See LICENSE for details.
11 #include "fast_export.h"
12 #include "line_buffer.h"
17 * Compare start of string to literal of equal length;
18 * must be guarded by length test.
20 #define constcmp(s, ref) memcmp(s, ref, sizeof(ref) - 1)
22 #define REPORT_FILENO 3
24 #define NODEACT_REPLACE 4
25 #define NODEACT_DELETE 3
27 #define NODEACT_CHANGE 1
28 #define NODEACT_UNKNOWN 0
31 #define DUMP_CTX 0 /* dump metadata */
32 #define REV_CTX 1 /* revision metadata */
33 #define NODE_CTX 2 /* node metadata */
34 #define INTERNODE_CTX 3 /* between nodes */
36 #define DATE_RFC2822_LEN 31
38 static struct line_buffer input
= LINE_BUFFER_INIT
;
41 uint32_t action
, srcRev
, type
;
42 off_t prop_length
, text_length
;
43 struct strbuf src
, dst
;
44 uint32_t text_delta
, prop_delta
;
49 unsigned long timestamp
;
50 struct strbuf log
, author
, note
;
55 struct strbuf uuid
, url
;
58 static void reset_node_ctx(char *fname
)
61 node_ctx
.action
= NODEACT_UNKNOWN
;
62 node_ctx
.prop_length
= -1;
63 node_ctx
.text_length
= -1;
64 strbuf_reset(&node_ctx
.src
);
66 strbuf_reset(&node_ctx
.dst
);
68 strbuf_addstr(&node_ctx
.dst
, fname
);
69 node_ctx
.text_delta
= 0;
70 node_ctx
.prop_delta
= 0;
73 static void reset_rev_ctx(uint32_t revision
)
75 rev_ctx
.revision
= revision
;
76 rev_ctx
.timestamp
= 0;
77 strbuf_reset(&rev_ctx
.log
);
78 strbuf_reset(&rev_ctx
.author
);
79 strbuf_reset(&rev_ctx
.note
);
82 static void reset_dump_ctx(const char *url
)
84 strbuf_reset(&dump_ctx
.url
);
86 strbuf_addstr(&dump_ctx
.url
, url
);
88 strbuf_reset(&dump_ctx
.uuid
);
91 static void handle_property(const struct strbuf
*key_buf
,
95 const char *key
= key_buf
->buf
;
96 size_t keylen
= key_buf
->len
;
99 case sizeof("svn:log"):
100 if (constcmp(key
, "svn:log"))
103 die("invalid dump: unsets svn:log");
104 strbuf_swap(&rev_ctx
.log
, val
);
106 case sizeof("svn:author"):
107 if (constcmp(key
, "svn:author"))
110 strbuf_reset(&rev_ctx
.author
);
112 strbuf_swap(&rev_ctx
.author
, val
);
114 case sizeof("svn:date"):
115 if (constcmp(key
, "svn:date"))
118 die("invalid dump: unsets svn:date");
119 if (parse_date_basic(val
->buf
, &rev_ctx
.timestamp
, NULL
))
120 warning("invalid timestamp: %s", val
->buf
);
122 case sizeof("svn:executable"):
123 case sizeof("svn:special"):
124 if (keylen
== strlen("svn:executable") &&
125 constcmp(key
, "svn:executable"))
127 if (keylen
== strlen("svn:special") &&
128 constcmp(key
, "svn:special"))
133 die("invalid dump: sets type twice");
136 node_ctx
.type
= S_IFREG
| 0644;
140 node_ctx
.type
= keylen
== strlen("svn:executable") ?
146 static void die_short_read(void)
148 if (buffer_ferror(&input
))
149 die_errno("error reading dump file");
150 die("invalid dump: unexpected end of file");
153 static void read_props(void)
155 static struct strbuf key
= STRBUF_INIT
;
156 static struct strbuf val
= STRBUF_INIT
;
159 * NEEDSWORK: to support simple mode changes like
166 * we keep track of whether a mode has been set and reset to
167 * plain file only if not. We should be keeping track of the
168 * symlink and executable bits separately instead.
170 uint32_t type_set
= 0;
171 while ((t
= buffer_read_line(&input
)) && strcmp(t
, "PROPS-END")) {
173 const char type
= t
[0];
176 if (!type
|| t
[1] != ' ')
177 die("invalid property line: %s", t
);
180 buffer_read_binary(&input
, &val
, len
);
184 /* Discard trailing newline. */
185 ch
= buffer_read_char(&input
);
189 die("invalid dump: expected newline after %s", val
.buf
);
193 strbuf_swap(&key
, &val
);
196 handle_property(&val
, NULL
, &type_set
);
199 handle_property(&key
, &val
, &type_set
);
203 die("invalid property line: %s", t
);
208 static void handle_node(void)
210 const uint32_t type
= node_ctx
.type
;
211 const int have_props
= node_ctx
.prop_length
!= -1;
212 const int have_text
= node_ctx
.text_length
!= -1;
214 * Old text for this node:
215 * NULL - directory or bug
217 * "<dataref>" - data retrievable from fast-import
219 static const char *const empty_blob
= "::empty::";
220 const char *old_data
= NULL
;
221 uint32_t old_mode
= S_IFREG
| 0644;
223 if (node_ctx
.action
== NODEACT_DELETE
) {
224 if (have_text
|| have_props
|| node_ctx
.srcRev
)
225 die("invalid dump: deletion node has "
226 "copyfrom info, text, or properties");
227 fast_export_delete(node_ctx
.dst
.buf
);
230 if (node_ctx
.action
== NODEACT_REPLACE
) {
231 fast_export_delete(node_ctx
.dst
.buf
);
232 node_ctx
.action
= NODEACT_ADD
;
234 if (node_ctx
.srcRev
) {
235 fast_export_copy(node_ctx
.srcRev
, node_ctx
.src
.buf
, node_ctx
.dst
.buf
);
236 if (node_ctx
.action
== NODEACT_ADD
)
237 node_ctx
.action
= NODEACT_CHANGE
;
239 if (have_text
&& type
== S_IFDIR
)
240 die("invalid dump: directories cannot have text attached");
243 * Find old content (old_data) and decide on the new mode.
245 if (node_ctx
.action
== NODEACT_CHANGE
&& !*node_ctx
.dst
.buf
) {
247 die("invalid dump: root of tree is not a regular file");
249 } else if (node_ctx
.action
== NODEACT_CHANGE
) {
251 old_data
= fast_export_read_path(node_ctx
.dst
.buf
, &mode
);
252 if (mode
== S_IFDIR
&& type
!= S_IFDIR
)
253 die("invalid dump: cannot modify a directory into a file");
254 if (mode
!= S_IFDIR
&& type
== S_IFDIR
)
255 die("invalid dump: cannot modify a file into a directory");
256 node_ctx
.type
= mode
;
258 } else if (node_ctx
.action
== NODEACT_ADD
) {
262 old_data
= empty_blob
;
264 die("invalid dump: adds node without text");
266 die("invalid dump: Node-path block lacks Node-action");
270 * Adjust mode to reflect properties.
273 if (!node_ctx
.prop_delta
)
274 node_ctx
.type
= type
;
275 if (node_ctx
.prop_length
)
282 if (type
== S_IFDIR
) /* directories are not tracked. */
285 if (old_data
== empty_blob
)
286 /* For the fast_export_* functions, NULL means empty. */
289 fast_export_modify(node_ctx
.dst
.buf
, node_ctx
.type
, old_data
);
292 if (!node_ctx
.text_delta
) {
293 fast_export_modify(node_ctx
.dst
.buf
, node_ctx
.type
, "inline");
294 fast_export_data(node_ctx
.type
, node_ctx
.text_length
, &input
);
297 fast_export_modify(node_ctx
.dst
.buf
, node_ctx
.type
, "inline");
298 fast_export_blob_delta(node_ctx
.type
, old_mode
, old_data
,
299 node_ctx
.text_length
, &input
);
302 static void begin_revision(const char *remote_ref
)
304 if (!rev_ctx
.revision
) /* revision 0 gets no git commit. */
306 fast_export_begin_commit(rev_ctx
.revision
, rev_ctx
.author
.buf
,
307 &rev_ctx
.log
, dump_ctx
.uuid
.buf
, dump_ctx
.url
.buf
,
308 rev_ctx
.timestamp
, remote_ref
);
311 static void end_revision(const char *note_ref
)
313 struct strbuf mark
= STRBUF_INIT
;
314 if (rev_ctx
.revision
) {
315 fast_export_end_commit(rev_ctx
.revision
);
316 fast_export_begin_note(rev_ctx
.revision
, "remote-svn",
317 "Note created by remote-svn.", rev_ctx
.timestamp
, note_ref
);
318 strbuf_addf(&mark
, ":%"PRIu32
, rev_ctx
.revision
);
319 fast_export_note(mark
.buf
, "inline");
320 fast_export_buf_to_data(&rev_ctx
.note
);
324 void svndump_read(const char *url
, const char *local_ref
, const char *notes_ref
)
328 uint32_t active_ctx
= DUMP_CTX
;
332 while ((t
= buffer_read_line(&input
))) {
333 val
= strchr(t
, ':');
341 /* strlen(key) + 1 */
342 switch (val
- t
- 1) {
343 case sizeof("SVN-fs-dump-format-version"):
344 if (constcmp(t
, "SVN-fs-dump-format-version"))
346 dump_ctx
.version
= atoi(val
);
347 if (dump_ctx
.version
> 3)
348 die("expected svn dump format version <= 3, found %"PRIu32
,
352 if (constcmp(t
, "UUID"))
354 strbuf_reset(&dump_ctx
.uuid
);
355 strbuf_addstr(&dump_ctx
.uuid
, val
);
357 case sizeof("Revision-number"):
358 if (constcmp(t
, "Revision-number"))
360 if (active_ctx
== NODE_CTX
)
362 if (active_ctx
== REV_CTX
)
363 begin_revision(local_ref
);
364 if (active_ctx
!= DUMP_CTX
)
365 end_revision(notes_ref
);
366 active_ctx
= REV_CTX
;
367 reset_rev_ctx(atoi(val
));
368 strbuf_addf(&rev_ctx
.note
, "%s\n", t
);
370 case sizeof("Node-path"):
371 if (constcmp(t
, "Node-"))
373 if (!constcmp(t
+ strlen("Node-"), "path")) {
374 if (active_ctx
== NODE_CTX
)
376 if (active_ctx
== REV_CTX
)
377 begin_revision(local_ref
);
378 active_ctx
= NODE_CTX
;
380 strbuf_addf(&rev_ctx
.note
, "%s\n", t
);
383 if (constcmp(t
+ strlen("Node-"), "kind"))
385 strbuf_addf(&rev_ctx
.note
, "%s\n", t
);
386 if (!strcmp(val
, "dir"))
387 node_ctx
.type
= S_IFDIR
;
388 else if (!strcmp(val
, "file"))
389 node_ctx
.type
= S_IFREG
| 0644;
391 fprintf(stderr
, "Unknown node-kind: %s\n", val
);
393 case sizeof("Node-action"):
394 if (constcmp(t
, "Node-action"))
396 strbuf_addf(&rev_ctx
.note
, "%s\n", t
);
397 if (!strcmp(val
, "delete")) {
398 node_ctx
.action
= NODEACT_DELETE
;
399 } else if (!strcmp(val
, "add")) {
400 node_ctx
.action
= NODEACT_ADD
;
401 } else if (!strcmp(val
, "change")) {
402 node_ctx
.action
= NODEACT_CHANGE
;
403 } else if (!strcmp(val
, "replace")) {
404 node_ctx
.action
= NODEACT_REPLACE
;
406 fprintf(stderr
, "Unknown node-action: %s\n", val
);
407 node_ctx
.action
= NODEACT_UNKNOWN
;
410 case sizeof("Node-copyfrom-path"):
411 if (constcmp(t
, "Node-copyfrom-path"))
413 strbuf_reset(&node_ctx
.src
);
414 strbuf_addstr(&node_ctx
.src
, val
);
415 strbuf_addf(&rev_ctx
.note
, "%s\n", t
);
417 case sizeof("Node-copyfrom-rev"):
418 if (constcmp(t
, "Node-copyfrom-rev"))
420 node_ctx
.srcRev
= atoi(val
);
421 strbuf_addf(&rev_ctx
.note
, "%s\n", t
);
423 case sizeof("Text-content-length"):
424 if (constcmp(t
, "Text") && constcmp(t
, "Prop"))
426 if (constcmp(t
+ 4, "-content-length"))
432 len
= strtoumax(val
, &end
, 10);
433 if (!isdigit(*val
) || *end
)
434 die("invalid dump: non-numeric length %s", val
);
435 if (len
> maximum_signed_value_of_type(off_t
))
436 die("unrepresentable length in dump: %s", val
);
439 node_ctx
.text_length
= (off_t
) len
;
441 node_ctx
.prop_length
= (off_t
) len
;
444 case sizeof("Text-delta"):
445 if (!constcmp(t
, "Text-delta")) {
446 node_ctx
.text_delta
= !strcmp(val
, "true");
449 if (constcmp(t
, "Prop-delta"))
451 node_ctx
.prop_delta
= !strcmp(val
, "true");
453 case sizeof("Content-length"):
454 if (constcmp(t
, "Content-length"))
457 t
= buffer_read_line(&input
);
461 die("invalid dump: expected blank line after content length header");
462 if (active_ctx
== REV_CTX
) {
464 } else if (active_ctx
== NODE_CTX
) {
466 active_ctx
= INTERNODE_CTX
;
468 fprintf(stderr
, "Unexpected content length header: %"PRIu32
"\n", len
);
469 if (buffer_skip_bytes(&input
, len
) != len
)
474 if (buffer_ferror(&input
))
476 if (active_ctx
== NODE_CTX
)
478 if (active_ctx
== REV_CTX
)
479 begin_revision(local_ref
);
480 if (active_ctx
!= DUMP_CTX
)
481 end_revision(notes_ref
);
484 static void init(int report_fd
)
486 fast_export_init(report_fd
);
487 strbuf_init(&dump_ctx
.uuid
, 4096);
488 strbuf_init(&dump_ctx
.url
, 4096);
489 strbuf_init(&rev_ctx
.log
, 4096);
490 strbuf_init(&rev_ctx
.author
, 4096);
491 strbuf_init(&rev_ctx
.note
, 4096);
492 strbuf_init(&node_ctx
.src
, 4096);
493 strbuf_init(&node_ctx
.dst
, 4096);
494 reset_dump_ctx(NULL
);
496 reset_node_ctx(NULL
);
500 int svndump_init(const char *filename
)
502 if (buffer_init(&input
, filename
))
503 return error_errno("cannot open %s", filename
? filename
: "NULL");
508 int svndump_init_fd(int in_fd
, int back_fd
)
510 if(buffer_fdinit(&input
, xdup(in_fd
)))
511 return error_errno("cannot open fd %d", in_fd
);
516 void svndump_deinit(void)
518 fast_export_deinit();
519 reset_dump_ctx(NULL
);
521 reset_node_ctx(NULL
);
522 strbuf_release(&rev_ctx
.log
);
523 strbuf_release(&rev_ctx
.author
);
524 strbuf_release(&rev_ctx
.note
);
525 strbuf_release(&node_ctx
.src
);
526 strbuf_release(&node_ctx
.dst
);
527 if (buffer_deinit(&input
))
528 fprintf(stderr
, "Input error\n");
530 fprintf(stderr
, "Output error\n");
533 void svndump_reset(void)
535 strbuf_release(&dump_ctx
.uuid
);
536 strbuf_release(&dump_ctx
.url
);
537 strbuf_release(&rev_ctx
.log
);
538 strbuf_release(&rev_ctx
.author
);