2 * svndumpfilter.c: Subversion dump stream filtering tool main file.
4 * ====================================================================
5 * Licensed to the Apache Software Foundation (ASF) under one
6 * or more contributor license agreements. See the NOTICE file
7 * distributed with this work for additional information
8 * regarding copyright ownership. The ASF licenses this file
9 * to you under the Apache License, Version 2.0 (the
10 * "License"); you may not use this file except in compliance
11 * with the License. You may obtain a copy of the License at
13 * http://www.apache.org/licenses/LICENSE-2.0
15 * Unless required by applicable law or agreed to in writing,
16 * software distributed under the License is distributed on an
17 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
18 * KIND, either express or implied. See the License for the
19 * specific language governing permissions and limitations
21 * ====================================================================
27 #include <apr_file_io.h>
29 #include "svn_private_config.h"
30 #include "svn_cmdline.h"
31 #include "svn_error.h"
32 #include "svn_string.h"
35 #include "svn_dirent_uri.h"
38 #include "svn_repos.h"
40 #include "svn_pools.h"
41 #include "svn_sorts.h"
42 #include "svn_props.h"
43 #include "svn_mergeinfo.h"
44 #include "svn_version.h"
46 #include "private/svn_mergeinfo_private.h"
47 #include "private/svn_cmdline_private.h"
48 #include "private/svn_subr_private.h"
51 typedef apr_status_t (__stdcall *open_fn_t)(apr_file_t **, apr_pool_t *);
53 typedef apr_status_t (*open_fn_t)(apr_file_t **, apr_pool_t *);
58 /* Helper to open stdio streams */
60 /* NOTE: we used to call svn_stream_from_stdio(), which wraps a stream
61 around a standard stdio.h FILE pointer. The problem is that these
62 pointers operate through C Run Time (CRT) on Win32, which does all
63 sorts of translation on them: LF's become CRLF's, and ctrl-Z's
64 embedded in Word documents are interpreted as premature EOF's.
66 So instead, we use apr_file_open_std*, which bypass the CRT and
67 directly wrap the OS's file-handles, which don't know or care about
68 translation. Thus dump/load works correctly on Win32.
71 create_stdio_stream(svn_stream_t **stream,
75 apr_file_t *stdio_file;
76 apr_status_t apr_err = open_fn(&stdio_file, pool);
79 return svn_error_wrap_apr(apr_err, _("Can't open stdio file"));
81 *stream = svn_stream_from_aprfile2(stdio_file, TRUE, pool);
86 /* Writes a property in dumpfile format to given stringbuf. */
88 write_prop_to_stringbuf(svn_stringbuf_t *strbuf,
90 const svn_string_t *value)
94 char buf[SVN_KEYLINE_MAXLEN];
96 /* Output name length, then name. */
97 namelen = strlen(name);
98 svn_stringbuf_appendbytes(strbuf, "K ", 2);
100 bytes_used = apr_snprintf(buf, sizeof(buf), "%" APR_SIZE_T_FMT, namelen);
101 svn_stringbuf_appendbytes(strbuf, buf, bytes_used);
102 svn_stringbuf_appendbyte(strbuf, '\n');
104 svn_stringbuf_appendbytes(strbuf, name, namelen);
105 svn_stringbuf_appendbyte(strbuf, '\n');
107 /* Output value length, then value. */
108 svn_stringbuf_appendbytes(strbuf, "V ", 2);
110 bytes_used = apr_snprintf(buf, sizeof(buf), "%" APR_SIZE_T_FMT, value->len);
111 svn_stringbuf_appendbytes(strbuf, buf, bytes_used);
112 svn_stringbuf_appendbyte(strbuf, '\n');
114 svn_stringbuf_appendbytes(strbuf, value->data, value->len);
115 svn_stringbuf_appendbyte(strbuf, '\n');
119 /* Writes a property deletion in dumpfile format to given stringbuf. */
121 write_propdel_to_stringbuf(svn_stringbuf_t **strbuf,
126 char buf[SVN_KEYLINE_MAXLEN];
128 /* Output name length, then name. */
129 namelen = strlen(name);
130 svn_stringbuf_appendbytes(*strbuf, "D ", 2);
132 bytes_used = apr_snprintf(buf, sizeof(buf), "%" APR_SIZE_T_FMT, namelen);
133 svn_stringbuf_appendbytes(*strbuf, buf, bytes_used);
134 svn_stringbuf_appendbyte(*strbuf, '\n');
136 svn_stringbuf_appendbytes(*strbuf, name, namelen);
137 svn_stringbuf_appendbyte(*strbuf, '\n');
141 /* Compare the node-path PATH with the (const char *) prefixes in PFXLIST.
142 * Return TRUE if any prefix is a prefix of PATH (matching whole path
143 * components); FALSE otherwise.
144 * PATH starts with a '/', as do the (const char *) paths in PREFIXES. */
146 ary_prefix_match(const apr_array_header_t *pfxlist, const char *path)
149 size_t path_len = strlen(path);
151 for (i = 0; i < pfxlist->nelts; i++)
153 const char *pfx = APR_ARRAY_IDX(pfxlist, i, const char *);
154 size_t pfx_len = strlen(pfx);
156 if (path_len < pfx_len)
158 if (strncmp(path, pfx, pfx_len) == 0
159 && (pfx_len == 1 || path[pfx_len] == '\0' || path[pfx_len] == '/'))
167 /* Check whether we need to skip this PATH based on its presence in
168 the PREFIXES list, and the DO_EXCLUDE option.
169 PATH starts with a '/', as do the (const char *) paths in PREFIXES. */
170 static APR_INLINE svn_boolean_t
171 skip_path(const char *path, const apr_array_header_t *prefixes,
172 svn_boolean_t do_exclude, svn_boolean_t glob)
174 const svn_boolean_t matches =
176 ? svn_cstring_match_glob_list(path, prefixes)
177 : ary_prefix_match(prefixes, path));
180 return (matches ? do_exclude : !do_exclude);
185 /* Note: the input stream parser calls us with events.
186 Output of the filtered dump occurs for the most part streamily with the
187 event callbacks, to avoid caching large quantities of data in memory.
188 The exceptions this are:
189 - All revision data (headers and props) must be cached until a non-skipped
190 node within the revision is found, or the revision is closed.
191 - Node headers and props must be cached until all props have been received
192 (to allow the Prop-content-length to be found). This is signalled either
193 by the node text arriving, or the node being closed.
194 The writing_begun members of the associated object batons track the state.
195 output_revision() and output_node() are called to cause this flushing of
196 cached data to occur.
200 /* Filtering batons */
204 svn_revnum_t rev; /* Last non-dropped revision to which this maps. */
205 svn_boolean_t was_dropped; /* Was this revision dropped? */
210 /* Command-line options values. */
211 svn_boolean_t do_exclude;
214 svn_boolean_t drop_empty_revs;
215 svn_boolean_t drop_all_empty_revs;
216 svn_boolean_t do_renumber_revs;
217 svn_boolean_t preserve_revprops;
218 svn_boolean_t skip_missing_merge_sources;
219 svn_boolean_t allow_deltas;
220 apr_array_header_t *prefixes;
222 /* Input and output streams. */
223 svn_stream_t *in_stream;
224 svn_stream_t *out_stream;
226 /* State for the filtering process. */
227 apr_int32_t rev_drop_count;
228 apr_hash_t *dropped_nodes;
229 apr_hash_t *renumber_history; /* svn_revnum_t -> struct revmap_t */
230 svn_revnum_t last_live_revision;
231 /* The oldest original revision, greater than r0, in the input
232 stream which was not filtered. */
233 svn_revnum_t oldest_original_rev;
236 struct revision_baton_t
238 /* Reference to the global parse baton. */
239 struct parse_baton_t *pb;
241 /* Does this revision have node or prop changes? */
242 svn_boolean_t has_nodes;
243 svn_boolean_t has_props;
245 /* Did we drop any nodes? */
246 svn_boolean_t had_dropped_nodes;
248 /* Written to output stream? */
249 svn_boolean_t writing_begun;
251 /* The original and new (re-mapped) revision numbers. */
252 svn_revnum_t rev_orig;
253 svn_revnum_t rev_actual;
255 /* Pointers to dumpfile data. */
256 svn_stringbuf_t *header;
262 /* Reference to the current revision baton. */
263 struct revision_baton_t *rb;
265 /* Are we skipping this node? */
266 svn_boolean_t do_skip;
268 /* Have we been instructed to change or remove props on, or change
269 the text of, this node? */
270 svn_boolean_t has_props;
271 svn_boolean_t has_text;
273 /* Written to output stream? */
274 svn_boolean_t writing_begun;
276 /* The text content length according to the dumpfile headers, because we
277 need the length before we have the actual text. */
280 /* Pointers to dumpfile data. */
281 svn_stringbuf_t *header;
282 svn_stringbuf_t *props;
285 svn_boolean_t has_prop_delta;
286 svn_boolean_t has_text_delta;
288 /* We might need the node path in a parse error message. */
294 /* Filtering vtable members */
296 /* File-format stamp. */
298 magic_header_record(int version, void *parse_baton, apr_pool_t *pool)
300 struct parse_baton_t *pb = parse_baton;
302 if (version >= SVN_REPOS_DUMPFILE_FORMAT_VERSION_DELTAS)
303 pb->allow_deltas = TRUE;
305 SVN_ERR(svn_stream_printf(pb->out_stream, pool,
306 SVN_REPOS_DUMPFILE_MAGIC_HEADER ": %d\n\n",
313 /* New revision: set up revision_baton, decide if we skip it. */
315 new_revision_record(void **revision_baton,
320 struct revision_baton_t *rb;
321 apr_hash_index_t *hi;
322 const char *rev_orig;
323 svn_stream_t *header_stream;
325 *revision_baton = apr_palloc(pool, sizeof(struct revision_baton_t));
326 rb = *revision_baton;
327 rb->pb = parse_baton;
328 rb->has_nodes = FALSE;
329 rb->has_props = FALSE;
330 rb->had_dropped_nodes = FALSE;
331 rb->writing_begun = FALSE;
332 rb->header = svn_stringbuf_create_empty(pool);
333 rb->props = apr_hash_make(pool);
335 header_stream = svn_stream_from_stringbuf(rb->header, pool);
337 rev_orig = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_REVISION_NUMBER);
338 rb->rev_orig = SVN_STR_TO_REV(rev_orig);
340 if (rb->pb->do_renumber_revs)
341 rb->rev_actual = rb->rev_orig - rb->pb->rev_drop_count;
343 rb->rev_actual = rb->rev_orig;
345 SVN_ERR(svn_stream_printf(header_stream, pool,
346 SVN_REPOS_DUMPFILE_REVISION_NUMBER ": %ld\n",
349 for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi))
351 const char *key = svn__apr_hash_index_key(hi);
352 const char *val = svn__apr_hash_index_val(hi);
354 if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH))
355 || (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH))
356 || (!strcmp(key, SVN_REPOS_DUMPFILE_REVISION_NUMBER)))
359 /* passthru: put header into header stringbuf. */
361 SVN_ERR(svn_stream_printf(header_stream, pool, "%s: %s\n",
365 SVN_ERR(svn_stream_close(header_stream));
371 /* Output revision to dumpstream
372 This may be called by new_node_record(), iff rb->has_nodes has been set
373 to TRUE, or by close_revision() otherwise. This must only be called
374 if rb->writing_begun is FALSE. */
376 output_revision(struct revision_baton_t *rb)
379 char buf[SVN_KEYLINE_MAXLEN];
380 apr_hash_index_t *hi;
381 svn_boolean_t write_out_rev = FALSE;
382 apr_pool_t *hash_pool = apr_hash_pool_get(rb->props);
383 svn_stringbuf_t *props = svn_stringbuf_create_empty(hash_pool);
384 apr_pool_t *subpool = svn_pool_create(hash_pool);
386 rb->writing_begun = TRUE;
388 /* If this revision has no nodes left because the ones it had were
389 dropped, and we are not dropping empty revisions, and we were not
390 told to preserve revision props, then we want to fixup the
391 revision props to only contain:
393 - a log message that reports that this revision is just stuffing. */
394 if ((! rb->pb->preserve_revprops)
396 && rb->had_dropped_nodes
397 && (! rb->pb->drop_empty_revs)
398 && (! rb->pb->drop_all_empty_revs))
400 apr_hash_t *old_props = rb->props;
401 rb->has_props = TRUE;
402 rb->props = apr_hash_make(hash_pool);
403 svn_hash_sets(rb->props, SVN_PROP_REVISION_DATE,
404 svn_hash_gets(old_props, SVN_PROP_REVISION_DATE));
405 svn_hash_sets(rb->props, SVN_PROP_REVISION_LOG,
406 svn_string_create(_("This is an empty revision for "
407 "padding."), hash_pool));
410 /* Now, "rasterize" the props to a string, and append the property
411 information to the header string. */
414 for (hi = apr_hash_first(subpool, rb->props);
416 hi = apr_hash_next(hi))
418 const char *pname = svn__apr_hash_index_key(hi);
419 const svn_string_t *pval = svn__apr_hash_index_val(hi);
421 write_prop_to_stringbuf(props, pname, pval);
423 svn_stringbuf_appendcstr(props, "PROPS-END\n");
424 svn_stringbuf_appendcstr(rb->header,
425 SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
426 bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT,
428 svn_stringbuf_appendbytes(rb->header, buf, bytes_used);
429 svn_stringbuf_appendbyte(rb->header, '\n');
432 svn_stringbuf_appendcstr(rb->header, SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
433 bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT, props->len);
434 svn_stringbuf_appendbytes(rb->header, buf, bytes_used);
435 svn_stringbuf_appendbyte(rb->header, '\n');
437 /* put an end to headers */
438 svn_stringbuf_appendbyte(rb->header, '\n');
440 /* put an end to revision */
441 svn_stringbuf_appendbyte(props, '\n');
443 /* write out the revision */
444 /* Revision is written out in the following cases:
445 1. If the revision has nodes or
446 it is revision 0 (Special case: To preserve the props on r0).
447 2. --drop-empty-revs has been supplied,
448 but revision has not all nodes dropped.
449 3. If no --drop-empty-revs or --drop-all-empty-revs have been supplied,
450 write out the revision which has no nodes to begin with.
452 if (rb->has_nodes || (rb->rev_orig == 0))
453 write_out_rev = TRUE;
454 else if (rb->pb->drop_empty_revs)
455 write_out_rev = ! rb->had_dropped_nodes;
456 else if (! rb->pb->drop_all_empty_revs)
457 write_out_rev = TRUE;
461 /* This revision is a keeper. */
462 SVN_ERR(svn_stream_write(rb->pb->out_stream,
463 rb->header->data, &(rb->header->len)));
464 SVN_ERR(svn_stream_write(rb->pb->out_stream,
465 props->data, &(props->len)));
467 /* Stash the oldest original rev not dropped. */
469 && !SVN_IS_VALID_REVNUM(rb->pb->oldest_original_rev))
470 rb->pb->oldest_original_rev = rb->rev_orig;
472 if (rb->pb->do_renumber_revs)
474 svn_revnum_t *rr_key;
475 struct revmap_t *rr_val;
476 apr_pool_t *rr_pool = apr_hash_pool_get(rb->pb->renumber_history);
477 rr_key = apr_palloc(rr_pool, sizeof(*rr_key));
478 rr_val = apr_palloc(rr_pool, sizeof(*rr_val));
479 *rr_key = rb->rev_orig;
480 rr_val->rev = rb->rev_actual;
481 rr_val->was_dropped = FALSE;
482 apr_hash_set(rb->pb->renumber_history, rr_key,
483 sizeof(*rr_key), rr_val);
484 rb->pb->last_live_revision = rb->rev_actual;
488 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
489 _("Revision %ld committed as %ld.\n"),
490 rb->rev_orig, rb->rev_actual));
494 /* We're dropping this revision. */
495 rb->pb->rev_drop_count++;
496 if (rb->pb->do_renumber_revs)
498 svn_revnum_t *rr_key;
499 struct revmap_t *rr_val;
500 apr_pool_t *rr_pool = apr_hash_pool_get(rb->pb->renumber_history);
501 rr_key = apr_palloc(rr_pool, sizeof(*rr_key));
502 rr_val = apr_palloc(rr_pool, sizeof(*rr_val));
503 *rr_key = rb->rev_orig;
504 rr_val->rev = rb->pb->last_live_revision;
505 rr_val->was_dropped = TRUE;
506 apr_hash_set(rb->pb->renumber_history, rr_key,
507 sizeof(*rr_key), rr_val);
511 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
512 _("Revision %ld skipped.\n"),
515 svn_pool_destroy(subpool);
520 /* UUID record here: dump it, as we do not filter them. */
522 uuid_record(const char *uuid, void *parse_baton, apr_pool_t *pool)
524 struct parse_baton_t *pb = parse_baton;
525 SVN_ERR(svn_stream_printf(pb->out_stream, pool,
526 SVN_REPOS_DUMPFILE_UUID ": %s\n\n", uuid));
531 /* New node here. Set up node_baton by copying headers. */
533 new_node_record(void **node_baton,
538 struct parse_baton_t *pb;
539 struct node_baton_t *nb;
540 char *node_path, *copyfrom_path;
541 apr_hash_index_t *hi;
544 *node_baton = apr_palloc(pool, sizeof(struct node_baton_t));
549 node_path = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_PATH);
550 copyfrom_path = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH);
552 /* Ensure that paths start with a leading '/'. */
553 if (node_path[0] != '/')
554 node_path = apr_pstrcat(pool, "/", node_path, (char *)NULL);
555 if (copyfrom_path && copyfrom_path[0] != '/')
556 copyfrom_path = apr_pstrcat(pool, "/", copyfrom_path, (char *)NULL);
558 nb->do_skip = skip_path(node_path, pb->prefixes,
559 pb->do_exclude, pb->glob);
561 /* If we're skipping the node, take note of path, discarding the
565 svn_hash_sets(pb->dropped_nodes,
566 apr_pstrdup(apr_hash_pool_get(pb->dropped_nodes),
569 nb->rb->had_dropped_nodes = TRUE;
573 tcl = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH);
575 /* Test if this node was copied from dropped source. */
577 skip_path(copyfrom_path, pb->prefixes, pb->do_exclude, pb->glob))
579 /* This node was copied from a dropped source.
580 We have a problem, since we did not want to drop this node too.
582 However, there is one special case we'll handle. If the node is
583 a file, and this was a copy-and-modify operation, then the
584 dumpfile should contain the new contents of the file. In this
585 scenario, we'll just do an add without history using the new
588 kind = svn_hash_gets(headers, SVN_REPOS_DUMPFILE_NODE_KIND);
590 /* If there is a Text-content-length header, and the kind is
591 "file", we just fallback to an add without history. */
592 if (tcl && (strcmp(kind, "file") == 0))
594 svn_hash_sets(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_PATH,
596 svn_hash_sets(headers, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV,
598 copyfrom_path = NULL;
600 /* Else, this is either a directory or a file whose contents we
601 don't have readily available. */
604 return svn_error_createf
605 (SVN_ERR_INCOMPLETE_DATA, 0,
606 _("Invalid copy source path '%s'"), copyfrom_path);
610 nb->has_props = FALSE;
611 nb->has_text = FALSE;
612 nb->has_prop_delta = FALSE;
613 nb->has_text_delta = FALSE;
614 nb->writing_begun = FALSE;
615 nb->tcl = tcl ? svn__atoui64(tcl) : 0;
616 nb->header = svn_stringbuf_create_empty(pool);
617 nb->props = svn_stringbuf_create_empty(pool);
618 nb->node_path = apr_pstrdup(pool, node_path);
620 /* Now we know for sure that we have a node that will not be
621 skipped, flush the revision if it has not already been done. */
622 nb->rb->has_nodes = TRUE;
623 if (! nb->rb->writing_begun)
624 SVN_ERR(output_revision(nb->rb));
626 for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi))
628 const char *key = svn__apr_hash_index_key(hi);
629 const char *val = svn__apr_hash_index_val(hi);
631 if ((!strcmp(key, SVN_REPOS_DUMPFILE_PROP_DELTA))
632 && (!strcmp(val, "true")))
633 nb->has_prop_delta = TRUE;
635 if ((!strcmp(key, SVN_REPOS_DUMPFILE_TEXT_DELTA))
636 && (!strcmp(val, "true")))
637 nb->has_text_delta = TRUE;
639 if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH))
640 || (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH))
641 || (!strcmp(key, SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH)))
644 /* Rewrite Node-Copyfrom-Rev if we are renumbering revisions.
645 The number points to some revision in the past. We keep track
646 of revision renumbering in an apr_hash, which maps original
647 revisions to new ones. Dropped revision are mapped to -1.
648 This should never happen here.
650 if (pb->do_renumber_revs
651 && (!strcmp(key, SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV)))
653 svn_revnum_t cf_orig_rev;
654 struct revmap_t *cf_renum_val;
656 cf_orig_rev = SVN_STR_TO_REV(val);
657 cf_renum_val = apr_hash_get(pb->renumber_history,
659 sizeof(svn_revnum_t));
660 if (! (cf_renum_val && SVN_IS_VALID_REVNUM(cf_renum_val->rev)))
661 return svn_error_createf
662 (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
663 _("No valid copyfrom revision in filtered stream"));
664 SVN_ERR(svn_stream_printf
665 (nb->rb->pb->out_stream, pool,
666 SVN_REPOS_DUMPFILE_NODE_COPYFROM_REV ": %ld\n",
671 /* passthru: put header straight to output */
673 SVN_ERR(svn_stream_printf(nb->rb->pb->out_stream,
683 /* Output node header and props to dumpstream
684 This will be called by set_fulltext() after setting nb->has_text to TRUE,
685 if the node has any text, or by close_node() otherwise. This must only
686 be called if nb->writing_begun is FALSE. */
688 output_node(struct node_baton_t *nb)
691 char buf[SVN_KEYLINE_MAXLEN];
693 nb->writing_begun = TRUE;
695 /* when there are no props nb->props->len would be zero and won't mess up
698 svn_stringbuf_appendcstr(nb->props, "PROPS-END\n");
700 /* 1. recalculate & check text-md5 if present. Passed through right now. */
702 /* 2. recalculate and add content-lengths */
706 svn_stringbuf_appendcstr(nb->header,
707 SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH);
708 bytes_used = apr_snprintf(buf, sizeof(buf), ": %" APR_SIZE_T_FMT,
710 svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
711 svn_stringbuf_appendbyte(nb->header, '\n');
715 svn_stringbuf_appendcstr(nb->header,
716 SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH);
717 bytes_used = apr_snprintf(buf, sizeof(buf), ": %" SVN_FILESIZE_T_FMT,
719 svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
720 svn_stringbuf_appendbyte(nb->header, '\n');
722 svn_stringbuf_appendcstr(nb->header, SVN_REPOS_DUMPFILE_CONTENT_LENGTH);
723 bytes_used = apr_snprintf(buf, sizeof(buf), ": %" SVN_FILESIZE_T_FMT,
724 (svn_filesize_t) (nb->props->len + nb->tcl));
725 svn_stringbuf_appendbytes(nb->header, buf, bytes_used);
726 svn_stringbuf_appendbyte(nb->header, '\n');
728 /* put an end to headers */
729 svn_stringbuf_appendbyte(nb->header, '\n');
731 /* 3. output all the stuff */
733 SVN_ERR(svn_stream_write(nb->rb->pb->out_stream,
734 nb->header->data , &(nb->header->len)));
735 SVN_ERR(svn_stream_write(nb->rb->pb->out_stream,
736 nb->props->data , &(nb->props->len)));
742 /* Examine the mergeinfo in INITIAL_VAL, omitting missing merge
743 sources or renumbering revisions in rangelists as appropriate, and
744 return the (possibly new) mergeinfo in *FINAL_VAL (allocated from
747 adjust_mergeinfo(svn_string_t **final_val, const svn_string_t *initial_val,
748 struct revision_baton_t *rb, apr_pool_t *pool)
750 apr_hash_t *mergeinfo;
751 apr_hash_t *final_mergeinfo = apr_hash_make(pool);
752 apr_hash_index_t *hi;
753 apr_pool_t *subpool = svn_pool_create(pool);
755 SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool));
757 /* Issue #3020: If we are skipping missing merge sources, then also
758 filter mergeinfo ranges as old or older than the oldest revision in the
759 dump stream. Those older than the oldest obviously refer to history
760 outside of the dump stream. The oldest rev itself is present in the
761 dump, but cannot be a valid merge source revision since it is the
762 start of all history. E.g. if we dump -r100:400 then dumpfilter the
763 result with --skip-missing-merge-sources, any mergeinfo with revision
764 100 implies a change of -r99:100, but r99 is part of the history we
765 want filtered. This is analogous to how r1 is always meaningless as
766 a merge source revision.
768 If the oldest rev is r0 then there is nothing to filter. */
769 if (rb->pb->skip_missing_merge_sources && rb->pb->oldest_original_rev > 0)
770 SVN_ERR(svn_mergeinfo__filter_mergeinfo_by_ranges(
771 &mergeinfo, mergeinfo,
772 rb->pb->oldest_original_rev, 0,
773 FALSE, subpool, subpool));
775 for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi))
777 const char *merge_source = svn__apr_hash_index_key(hi);
778 svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
779 struct parse_baton_t *pb = rb->pb;
781 /* Determine whether the merge_source is a part of the prefix. */
782 if (skip_path(merge_source, pb->prefixes, pb->do_exclude, pb->glob))
784 if (pb->skip_missing_merge_sources)
787 return svn_error_createf(SVN_ERR_INCOMPLETE_DATA, 0,
788 _("Missing merge source path '%s'; try "
789 "with --skip-missing-merge-sources"),
793 /* Possibly renumber revisions in merge source's rangelist. */
794 if (pb->do_renumber_revs)
798 for (i = 0; i < rangelist->nelts; i++)
800 struct revmap_t *revmap_start;
801 struct revmap_t *revmap_end;
802 svn_merge_range_t *range = APR_ARRAY_IDX(rangelist, i,
803 svn_merge_range_t *);
805 revmap_start = apr_hash_get(pb->renumber_history,
806 &range->start, sizeof(svn_revnum_t));
807 if (! (revmap_start && SVN_IS_VALID_REVNUM(revmap_start->rev)))
808 return svn_error_createf
809 (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
810 _("No valid revision range 'start' in filtered stream"));
812 revmap_end = apr_hash_get(pb->renumber_history,
813 &range->end, sizeof(svn_revnum_t));
814 if (! (revmap_end && SVN_IS_VALID_REVNUM(revmap_end->rev)))
815 return svn_error_createf
816 (SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
817 _("No valid revision range 'end' in filtered stream"));
819 range->start = revmap_start->rev;
820 range->end = revmap_end->rev;
823 svn_hash_sets(final_mergeinfo, merge_source, rangelist);
826 SVN_ERR(svn_mergeinfo_sort(final_mergeinfo, subpool));
827 SVN_ERR(svn_mergeinfo_to_string(final_val, final_mergeinfo, pool));
828 svn_pool_destroy(subpool);
835 set_revision_property(void *revision_baton,
837 const svn_string_t *value)
839 struct revision_baton_t *rb = revision_baton;
840 apr_pool_t *hash_pool = apr_hash_pool_get(rb->props);
842 rb->has_props = TRUE;
843 svn_hash_sets(rb->props,
844 apr_pstrdup(hash_pool, name),
845 svn_string_dup(value, hash_pool));
851 set_node_property(void *node_baton,
853 const svn_string_t *value)
855 struct node_baton_t *nb = node_baton;
856 struct revision_baton_t *rb = nb->rb;
861 if (! (nb->has_props || nb->has_prop_delta))
862 return svn_error_createf(SVN_ERR_STREAM_MALFORMED_DATA, NULL,
863 _("Delta property block detected, but deltas "
864 "are not enabled for node '%s' in original "
866 nb->node_path, rb->rev_orig);
868 if (strcmp(name, SVN_PROP_MERGEINFO) == 0)
870 svn_string_t *filtered_mergeinfo; /* Avoid compiler warning. */
871 apr_pool_t *pool = apr_hash_pool_get(rb->props);
872 SVN_ERR(adjust_mergeinfo(&filtered_mergeinfo, value, rb, pool));
873 value = filtered_mergeinfo;
876 nb->has_props = TRUE;
877 write_prop_to_stringbuf(nb->props, name, value);
884 delete_node_property(void *node_baton, const char *name)
886 struct node_baton_t *nb = node_baton;
887 struct revision_baton_t *rb = nb->rb;
892 if (!nb->has_prop_delta)
893 return svn_error_createf(SVN_ERR_STREAM_MALFORMED_DATA, NULL,
894 _("Delta property block detected, but deltas "
895 "are not enabled for node '%s' in original "
897 nb->node_path, rb->rev_orig);
899 nb->has_props = TRUE;
900 write_propdel_to_stringbuf(&(nb->props), name);
907 remove_node_props(void *node_baton)
909 struct node_baton_t *nb = node_baton;
911 /* In this case, not actually indicating that the node *has* props,
912 rather that we know about all the props that it has, since it now
914 nb->has_props = TRUE;
921 set_fulltext(svn_stream_t **stream, void *node_baton)
923 struct node_baton_t *nb = node_baton;
928 if (! nb->writing_begun)
929 SVN_ERR(output_node(nb));
930 *stream = nb->rb->pb->out_stream;
939 close_node(void *node_baton)
941 struct node_baton_t *nb = node_baton;
944 /* Get out of here if we can. */
948 /* If the node was not flushed already to output its text, do it now. */
949 if (! nb->writing_begun)
950 SVN_ERR(output_node(nb));
952 /* put an end to node. */
953 SVN_ERR(svn_stream_write(nb->rb->pb->out_stream, "\n\n", &len));
959 /* Finalize revision */
961 close_revision(void *revision_baton)
963 struct revision_baton_t *rb = revision_baton;
965 /* If no node has yet flushed the revision, do it now. */
966 if (! rb->writing_begun)
967 return output_revision(rb);
973 /* Filtering vtable */
974 svn_repos_parse_fns3_t filtering_vtable =
980 set_revision_property,
982 delete_node_property,
994 static svn_opt_subcommand_t
1001 svndumpfilter__drop_empty_revs = SVN_OPT_FIRST_LONGOPT_ID,
1002 svndumpfilter__drop_all_empty_revs,
1003 svndumpfilter__renumber_revs,
1004 svndumpfilter__preserve_revprops,
1005 svndumpfilter__skip_missing_merge_sources,
1006 svndumpfilter__targets,
1007 svndumpfilter__quiet,
1008 svndumpfilter__glob,
1009 svndumpfilter__version
1012 /* Option codes and descriptions.
1014 * The entire list must be terminated with an entry of nulls.
1016 static const apr_getopt_option_t options_table[] =
1019 N_("show help on a subcommand")},
1022 N_("show help on a subcommand")},
1024 {"version", svndumpfilter__version, 0,
1025 N_("show program version information") },
1026 {"quiet", svndumpfilter__quiet, 0,
1027 N_("Do not display filtering statistics.") },
1028 {"pattern", svndumpfilter__glob, 0,
1029 N_("Treat the path prefixes as file glob patterns.") },
1030 {"drop-empty-revs", svndumpfilter__drop_empty_revs, 0,
1031 N_("Remove revisions emptied by filtering.")},
1032 {"drop-all-empty-revs", svndumpfilter__drop_all_empty_revs, 0,
1033 N_("Remove all empty revisions found in dumpstream\n"
1034 " except revision 0.")},
1035 {"renumber-revs", svndumpfilter__renumber_revs, 0,
1036 N_("Renumber revisions left after filtering.") },
1037 {"skip-missing-merge-sources",
1038 svndumpfilter__skip_missing_merge_sources, 0,
1039 N_("Skip missing merge sources.") },
1040 {"preserve-revprops", svndumpfilter__preserve_revprops, 0,
1041 N_("Don't filter revision properties.") },
1042 {"targets", svndumpfilter__targets, 1,
1043 N_("Read additional prefixes, one per line, from\n"
1049 /* Array of available subcommands.
1050 * The entire list must be terminated with an entry of nulls.
1052 static const svn_opt_subcommand_desc2_t cmd_table[] =
1054 {"exclude", subcommand_exclude, {0},
1055 N_("Filter out nodes with given prefixes from dumpstream.\n"
1056 "usage: svndumpfilter exclude PATH_PREFIX...\n"),
1057 {svndumpfilter__drop_empty_revs, svndumpfilter__drop_all_empty_revs,
1058 svndumpfilter__renumber_revs,
1059 svndumpfilter__skip_missing_merge_sources, svndumpfilter__targets,
1060 svndumpfilter__preserve_revprops, svndumpfilter__quiet,
1061 svndumpfilter__glob} },
1063 {"include", subcommand_include, {0},
1064 N_("Filter out nodes without given prefixes from dumpstream.\n"
1065 "usage: svndumpfilter include PATH_PREFIX...\n"),
1066 {svndumpfilter__drop_empty_revs, svndumpfilter__drop_all_empty_revs,
1067 svndumpfilter__renumber_revs,
1068 svndumpfilter__skip_missing_merge_sources, svndumpfilter__targets,
1069 svndumpfilter__preserve_revprops, svndumpfilter__quiet,
1070 svndumpfilter__glob} },
1072 {"help", subcommand_help, {"?", "h"},
1073 N_("Describe the usage of this program or its subcommands.\n"
1074 "usage: svndumpfilter help [SUBCOMMAND...]\n"),
1077 { NULL, NULL, {0}, NULL, {0} }
1081 /* Baton for passing option/argument state to a subcommand function. */
1082 struct svndumpfilter_opt_state
1084 svn_opt_revision_t start_revision; /* -r X[:Y] is */
1085 svn_opt_revision_t end_revision; /* not implemented. */
1086 svn_boolean_t quiet; /* --quiet */
1087 svn_boolean_t glob; /* --pattern */
1088 svn_boolean_t version; /* --version */
1089 svn_boolean_t drop_empty_revs; /* --drop-empty-revs */
1090 svn_boolean_t drop_all_empty_revs; /* --drop-all-empty-revs */
1091 svn_boolean_t help; /* --help or -? */
1092 svn_boolean_t renumber_revs; /* --renumber-revs */
1093 svn_boolean_t preserve_revprops; /* --preserve-revprops */
1094 svn_boolean_t skip_missing_merge_sources;
1095 /* --skip-missing-merge-sources */
1096 const char *targets_file; /* --targets-file */
1097 apr_array_header_t *prefixes; /* mainargs. */
1101 static svn_error_t *
1102 parse_baton_initialize(struct parse_baton_t **pb,
1103 struct svndumpfilter_opt_state *opt_state,
1104 svn_boolean_t do_exclude,
1107 struct parse_baton_t *baton = apr_palloc(pool, sizeof(*baton));
1109 /* Read the stream from STDIN. Users can redirect a file. */
1110 SVN_ERR(create_stdio_stream(&(baton->in_stream),
1111 apr_file_open_stdin, pool));
1113 /* Have the parser dump results to STDOUT. Users can redirect a file. */
1114 SVN_ERR(create_stdio_stream(&(baton->out_stream),
1115 apr_file_open_stdout, pool));
1117 baton->do_exclude = do_exclude;
1119 /* Ignore --renumber-revs if there can't possibly be
1120 anything to renumber. */
1121 baton->do_renumber_revs =
1122 (opt_state->renumber_revs && (opt_state->drop_empty_revs
1123 || opt_state->drop_all_empty_revs));
1125 baton->drop_empty_revs = opt_state->drop_empty_revs;
1126 baton->drop_all_empty_revs = opt_state->drop_all_empty_revs;
1127 baton->preserve_revprops = opt_state->preserve_revprops;
1128 baton->quiet = opt_state->quiet;
1129 baton->glob = opt_state->glob;
1130 baton->prefixes = opt_state->prefixes;
1131 baton->skip_missing_merge_sources = opt_state->skip_missing_merge_sources;
1132 baton->rev_drop_count = 0; /* used to shift revnums while filtering */
1133 baton->dropped_nodes = apr_hash_make(pool);
1134 baton->renumber_history = apr_hash_make(pool);
1135 baton->last_live_revision = SVN_INVALID_REVNUM;
1136 baton->oldest_original_rev = SVN_INVALID_REVNUM;
1137 baton->allow_deltas = FALSE;
1140 return SVN_NO_ERROR;
1143 /* This implements `help` subcommand. */
1144 static svn_error_t *
1145 subcommand_help(apr_getopt_t *os, void *baton, apr_pool_t *pool)
1147 struct svndumpfilter_opt_state *opt_state = baton;
1148 const char *header =
1149 _("general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
1150 "Type 'svndumpfilter help <subcommand>' for help on a "
1151 "specific subcommand.\n"
1152 "Type 'svndumpfilter --version' to see the program version.\n"
1154 "Available subcommands:\n");
1156 SVN_ERR(svn_opt_print_help4(os, "svndumpfilter",
1157 opt_state ? opt_state->version : FALSE,
1158 opt_state ? opt_state->quiet : FALSE,
1159 /*###opt_state ? opt_state->verbose :*/ FALSE,
1160 NULL, header, cmd_table, options_table,
1163 return SVN_NO_ERROR;
1167 /* Version compatibility check */
1168 static svn_error_t *
1169 check_lib_versions(void)
1171 static const svn_version_checklist_t checklist[] =
1173 { "svn_subr", svn_subr_version },
1174 { "svn_repos", svn_repos_version },
1175 { "svn_delta", svn_delta_version },
1178 SVN_VERSION_DEFINE(my_version);
1180 return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
1184 /* Do the real work of filtering. */
1185 static svn_error_t *
1186 do_filter(apr_getopt_t *os,
1188 svn_boolean_t do_exclude,
1191 struct svndumpfilter_opt_state *opt_state = baton;
1192 struct parse_baton_t *pb;
1193 apr_hash_index_t *hi;
1194 apr_array_header_t *keys;
1197 if (! opt_state->quiet)
1199 apr_pool_t *subpool = svn_pool_create(pool);
1201 if (opt_state->glob)
1203 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
1205 ? (opt_state->drop_empty_revs
1206 || opt_state->drop_all_empty_revs)
1207 ? _("Excluding (and dropping empty "
1208 "revisions for) prefix patterns:\n")
1209 : _("Excluding prefix patterns:\n")
1210 : (opt_state->drop_empty_revs
1211 || opt_state->drop_all_empty_revs)
1212 ? _("Including (and dropping empty "
1213 "revisions for) prefix patterns:\n")
1214 : _("Including prefix patterns:\n")));
1218 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
1220 ? (opt_state->drop_empty_revs
1221 || opt_state->drop_all_empty_revs)
1222 ? _("Excluding (and dropping empty "
1223 "revisions for) prefixes:\n")
1224 : _("Excluding prefixes:\n")
1225 : (opt_state->drop_empty_revs
1226 || opt_state->drop_all_empty_revs)
1227 ? _("Including (and dropping empty "
1228 "revisions for) prefixes:\n")
1229 : _("Including prefixes:\n")));
1232 for (i = 0; i < opt_state->prefixes->nelts; i++)
1234 svn_pool_clear(subpool);
1235 SVN_ERR(svn_cmdline_fprintf
1236 (stderr, subpool, " '%s'\n",
1237 APR_ARRAY_IDX(opt_state->prefixes, i, const char *)));
1240 SVN_ERR(svn_cmdline_fputs("\n", stderr, subpool));
1241 svn_pool_destroy(subpool);
1244 SVN_ERR(parse_baton_initialize(&pb, opt_state, do_exclude, pool));
1245 SVN_ERR(svn_repos_parse_dumpstream3(pb->in_stream, &filtering_vtable, pb,
1246 TRUE, NULL, NULL, pool));
1248 /* The rest of this is just reporting. If we aren't reporting, get
1250 if (opt_state->quiet)
1251 return SVN_NO_ERROR;
1253 SVN_ERR(svn_cmdline_fputs("\n", stderr, pool));
1255 if (pb->rev_drop_count)
1256 SVN_ERR(svn_cmdline_fprintf(stderr, pool,
1257 Q_("Dropped %d revision.\n\n",
1258 "Dropped %d revisions.\n\n",
1259 pb->rev_drop_count),
1260 pb->rev_drop_count));
1262 if (pb->do_renumber_revs)
1264 apr_pool_t *subpool = svn_pool_create(pool);
1265 SVN_ERR(svn_cmdline_fputs(_("Revisions renumbered as follows:\n"),
1268 /* Get the keys of the hash, sort them, then print the hash keys
1269 and values, sorted by keys. */
1270 num_keys = apr_hash_count(pb->renumber_history);
1271 keys = apr_array_make(pool, num_keys + 1, sizeof(svn_revnum_t));
1272 for (hi = apr_hash_first(pool, pb->renumber_history);
1274 hi = apr_hash_next(hi))
1276 const svn_revnum_t *revnum = svn__apr_hash_index_key(hi);
1278 APR_ARRAY_PUSH(keys, svn_revnum_t) = *revnum;
1280 qsort(keys->elts, keys->nelts,
1281 keys->elt_size, svn_sort_compare_revisions);
1282 for (i = 0; i < keys->nelts; i++)
1284 svn_revnum_t this_key;
1285 struct revmap_t *this_val;
1287 svn_pool_clear(subpool);
1288 this_key = APR_ARRAY_IDX(keys, i, svn_revnum_t);
1289 this_val = apr_hash_get(pb->renumber_history, &this_key,
1291 if (this_val->was_dropped)
1292 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
1293 _(" %ld => (dropped)\n"),
1296 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
1298 this_key, this_val->rev));
1300 SVN_ERR(svn_cmdline_fputs("\n", stderr, subpool));
1301 svn_pool_destroy(subpool);
1304 if ((num_keys = apr_hash_count(pb->dropped_nodes)))
1306 apr_pool_t *subpool = svn_pool_create(pool);
1307 SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
1308 Q_("Dropped %d node:\n",
1309 "Dropped %d nodes:\n",
1313 /* Get the keys of the hash, sort them, then print the hash keys
1314 and values, sorted by keys. */
1315 keys = apr_array_make(pool, num_keys + 1, sizeof(const char *));
1316 for (hi = apr_hash_first(pool, pb->dropped_nodes);
1318 hi = apr_hash_next(hi))
1320 const char *path = svn__apr_hash_index_key(hi);
1322 APR_ARRAY_PUSH(keys, const char *) = path;
1324 qsort(keys->elts, keys->nelts, keys->elt_size, svn_sort_compare_paths);
1325 for (i = 0; i < keys->nelts; i++)
1327 svn_pool_clear(subpool);
1328 SVN_ERR(svn_cmdline_fprintf
1329 (stderr, subpool, " '%s'\n",
1330 (const char *)APR_ARRAY_IDX(keys, i, const char *)));
1332 SVN_ERR(svn_cmdline_fputs("\n", stderr, subpool));
1333 svn_pool_destroy(subpool);
1336 return SVN_NO_ERROR;
1339 /* This implements `exclude' subcommand. */
1340 static svn_error_t *
1341 subcommand_exclude(apr_getopt_t *os, void *baton, apr_pool_t *pool)
1343 return do_filter(os, baton, TRUE, pool);
1347 /* This implements `include` subcommand. */
1348 static svn_error_t *
1349 subcommand_include(apr_getopt_t *os, void *baton, apr_pool_t *pool)
1351 return do_filter(os, baton, FALSE, pool);
1359 main(int argc, const char *argv[])
1362 apr_status_t apr_err;
1365 const svn_opt_subcommand_desc2_t *subcommand = NULL;
1366 struct svndumpfilter_opt_state opt_state;
1369 apr_array_header_t *received_opts;
1373 /* Initialize the app. */
1374 if (svn_cmdline_init("svndumpfilter", stderr) != EXIT_SUCCESS)
1375 return EXIT_FAILURE;
1377 /* Create our top-level pool. Use a separate mutexless allocator,
1378 * given this application is single threaded.
1380 pool = apr_allocator_owner_get(svn_pool_create_allocator(FALSE));
1382 /* Check library versions */
1383 err = check_lib_versions();
1385 return svn_cmdline_handle_exit_error(err, pool, "svndumpfilter: ");
1387 received_opts = apr_array_make(pool, SVN_OPT_MAX_OPTIONS, sizeof(int));
1389 /* Initialize the FS library. */
1390 err = svn_fs_initialize(pool);
1392 return svn_cmdline_handle_exit_error(err, pool, "svndumpfilter: ");
1396 SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
1397 svn_pool_destroy(pool);
1398 return EXIT_FAILURE;
1401 /* Initialize opt_state. */
1402 memset(&opt_state, 0, sizeof(opt_state));
1403 opt_state.start_revision.kind = svn_opt_revision_unspecified;
1404 opt_state.end_revision.kind = svn_opt_revision_unspecified;
1406 /* Parse options. */
1407 err = svn_cmdline__getopt_init(&os, argc, argv, pool);
1409 return svn_cmdline_handle_exit_error(err, pool, "svndumpfilter: ");
1414 const char *opt_arg;
1416 /* Parse the next option. */
1417 apr_err = apr_getopt_long(os, options_table, &opt_id, &opt_arg);
1418 if (APR_STATUS_IS_EOF(apr_err))
1422 SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
1423 svn_pool_destroy(pool);
1424 return EXIT_FAILURE;
1427 /* Stash the option code in an array before parsing it. */
1428 APR_ARRAY_PUSH(received_opts, int) = opt_id;
1434 opt_state.help = TRUE;
1436 case svndumpfilter__version:
1437 opt_state.version = TRUE;
1439 case svndumpfilter__quiet:
1440 opt_state.quiet = TRUE;
1442 case svndumpfilter__glob:
1443 opt_state.glob = TRUE;
1445 case svndumpfilter__drop_empty_revs:
1446 opt_state.drop_empty_revs = TRUE;
1448 case svndumpfilter__drop_all_empty_revs:
1449 opt_state.drop_all_empty_revs = TRUE;
1451 case svndumpfilter__renumber_revs:
1452 opt_state.renumber_revs = TRUE;
1454 case svndumpfilter__preserve_revprops:
1455 opt_state.preserve_revprops = TRUE;
1457 case svndumpfilter__skip_missing_merge_sources:
1458 opt_state.skip_missing_merge_sources = TRUE;
1460 case svndumpfilter__targets:
1461 opt_state.targets_file = opt_arg;
1465 SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
1466 svn_pool_destroy(pool);
1467 return EXIT_FAILURE;
1469 } /* close `switch' */
1470 } /* close `while' */
1472 /* Disallow simultaneous use of both --drop-empty-revs and
1473 --drop-all-empty-revs. */
1474 if (opt_state.drop_empty_revs && opt_state.drop_all_empty_revs)
1476 err = svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
1477 _("--drop-empty-revs cannot be used with "
1478 "--drop-all-empty-revs"));
1479 return svn_cmdline_handle_exit_error(err, pool, "svndumpfilter: ");
1482 /* If the user asked for help, then the rest of the arguments are
1483 the names of subcommands to get help on (if any), or else they're
1484 just typos/mistakes. Whatever the case, the subcommand to
1485 actually run is subcommand_help(). */
1487 subcommand = svn_opt_get_canonical_subcommand2(cmd_table, "help");
1489 /* If we're not running the `help' subcommand, then look for a
1490 subcommand in the first argument. */
1491 if (subcommand == NULL)
1493 if (os->ind >= os->argc)
1495 if (opt_state.version)
1497 /* Use the "help" subcommand to handle the "--version" option. */
1498 static const svn_opt_subcommand_desc2_t pseudo_cmd =
1499 { "--version", subcommand_help, {0}, "",
1500 {svndumpfilter__version, /* must accept its own option */
1501 svndumpfilter__quiet,
1504 subcommand = &pseudo_cmd;
1508 svn_error_clear(svn_cmdline_fprintf
1510 _("Subcommand argument required\n")));
1511 SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
1512 svn_pool_destroy(pool);
1513 return EXIT_FAILURE;
1518 const char *first_arg = os->argv[os->ind++];
1519 subcommand = svn_opt_get_canonical_subcommand2(cmd_table, first_arg);
1520 if (subcommand == NULL)
1522 const char* first_arg_utf8;
1523 if ((err = svn_utf_cstring_to_utf8(&first_arg_utf8, first_arg,
1525 return svn_cmdline_handle_exit_error(err, pool,
1529 svn_cmdline_fprintf(stderr, pool,
1530 _("Unknown subcommand: '%s'\n"),
1532 SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
1533 svn_pool_destroy(pool);
1534 return EXIT_FAILURE;
1539 /* If there's a second argument, it's probably [one of] prefixes.
1540 Every subcommand except `help' requires at least one, so we parse
1541 them out here and store in opt_state. */
1543 if (subcommand->cmd_func != subcommand_help)
1546 opt_state.prefixes = apr_array_make(pool, os->argc - os->ind,
1547 sizeof(const char *));
1548 for (i = os->ind ; i< os->argc; i++)
1552 /* Ensure that each prefix is UTF8-encoded, in internal
1553 style, and absolute. */
1554 SVN_INT_ERR(svn_utf_cstring_to_utf8(&prefix, os->argv[i], pool));
1555 prefix = svn_relpath__internal_style(prefix, pool);
1556 if (prefix[0] != '/')
1557 prefix = apr_pstrcat(pool, "/", prefix, (char *)NULL);
1558 APR_ARRAY_PUSH(opt_state.prefixes, const char *) = prefix;
1561 if (opt_state.targets_file)
1563 svn_stringbuf_t *buffer, *buffer_utf8;
1564 const char *utf8_targets_file;
1565 apr_array_header_t *targets = apr_array_make(pool, 0,
1566 sizeof(const char *));
1568 /* We need to convert to UTF-8 now, even before we divide
1569 the targets into an array, because otherwise we wouldn't
1570 know what delimiter to use for svn_cstring_split(). */
1572 SVN_INT_ERR(svn_utf_cstring_to_utf8(&utf8_targets_file,
1573 opt_state.targets_file, pool));
1575 SVN_INT_ERR(svn_stringbuf_from_file2(&buffer, utf8_targets_file,
1577 SVN_INT_ERR(svn_utf_stringbuf_to_utf8(&buffer_utf8, buffer, pool));
1579 targets = apr_array_append(pool,
1580 svn_cstring_split(buffer_utf8->data, "\n\r",
1584 for (i = 0; i < targets->nelts; i++)
1586 const char *prefix = APR_ARRAY_IDX(targets, i, const char *);
1587 if (prefix[0] != '/')
1588 prefix = apr_pstrcat(pool, "/", prefix, (char *)NULL);
1589 APR_ARRAY_PUSH(opt_state.prefixes, const char *) = prefix;
1593 if (apr_is_empty_array(opt_state.prefixes))
1595 svn_error_clear(svn_cmdline_fprintf
1597 _("\nError: no prefixes supplied.\n")));
1598 svn_pool_destroy(pool);
1599 return EXIT_FAILURE;
1604 /* Check that the subcommand wasn't passed any inappropriate options. */
1605 for (i = 0; i < received_opts->nelts; i++)
1607 opt_id = APR_ARRAY_IDX(received_opts, i, int);
1609 /* All commands implicitly accept --help, so just skip over this
1610 when we see it. Note that we don't want to include this option
1611 in their "accepted options" list because it would be awfully
1612 redundant to display it in every commands' help text. */
1613 if (opt_id == 'h' || opt_id == '?')
1616 if (! svn_opt_subcommand_takes_option3(subcommand, opt_id, NULL))
1619 const apr_getopt_option_t *badopt =
1620 svn_opt_get_option_from_code2(opt_id, options_table, subcommand,
1622 svn_opt_format_option(&optstr, badopt, FALSE, pool);
1623 if (subcommand->name[0] == '-')
1624 SVN_INT_ERR(subcommand_help(NULL, NULL, pool));
1626 svn_error_clear(svn_cmdline_fprintf
1628 _("Subcommand '%s' doesn't accept option '%s'\n"
1629 "Type 'svndumpfilter help %s' for usage.\n"),
1630 subcommand->name, optstr, subcommand->name));
1631 svn_pool_destroy(pool);
1632 return EXIT_FAILURE;
1636 /* Run the subcommand. */
1637 err = (*subcommand->cmd_func)(os, &opt_state, pool);
1640 /* For argument-related problems, suggest using the 'help'
1642 if (err->apr_err == SVN_ERR_CL_INSUFFICIENT_ARGS
1643 || err->apr_err == SVN_ERR_CL_ARG_PARSING_ERROR)
1645 err = svn_error_quick_wrap(err,
1646 _("Try 'svndumpfilter help' for more "
1649 return svn_cmdline_handle_exit_error(err, pool, "svndumpfilter: ");
1653 svn_pool_destroy(pool);
1655 /* Flush stdout, making sure the user will see any print errors. */
1656 SVN_INT_ERR(svn_cmdline_fflush(stdout));
1657 return EXIT_SUCCESS;