Changeset 109308 in vbox

Timestamp:

May 16, 2025 9:10:21 PM (9 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168914

Message:

svnsync-vbox: Add option to control censoring of author, and set up a parallel repo which gets updated as well.

File:

• trunk/src/apps/svnsync-vbox/main.c (modified) (27 diffs)

trunk/src/apps/svnsync-vbox/main.c

@@ -47 +47 @@
 #define SVNSYNC_PROP_LICENSE            SVNSYNC_PROP_PREFIX "license"
 #define SVNSYNC_PROP_DEFAULT_PROCESS    SVNSYNC_PROP_PREFIX "default-process"
+#define SVNSYNC_PROP_CENSOR_AUTHOR      SVNSYNC_PROP_PREFIX "censor-author"
 #define SVNSYNC_PROP_REPLACE_EXTERNALS  SVNSYNC_PROP_PREFIX "replace-externals"
 #define SVNSYNC_PROP_REPLACE_LICENSE    SVNSYNC_PROP_PREFIX "replace-license"
@@ -98 +99 @@
   svnsync_opt_config_dir,
 #ifdef VBOX
+  svnsync_opt_censor_author,
   svnsync_opt_start_rev,
   svnsync_opt_default_process,
@@ -114 +116 @@
 #ifdef VBOX
 #define SVNSYNC_OPTS_INITIALIZE SVNSYNC_OPTS_DEFAULT, \
+  svnsync_opt_censor_author, \
   svnsync_opt_start_rev, \
   svnsync_opt_default_process, \
@@ -177 +180 @@
                        N_("read user configuration files from directory ARG")},
 #ifdef VBOX
+    {"censor-author",  svnsync_opt_censor_author, 0,
+                       N_("ignore all revisions before ARG")},
     {"start-rev",      svnsync_opt_start_rev, 1,
                        N_("ignore all revisions before ARG")},
@@ -203 +208 @@
   const char *config_dir;
 #ifdef VBOX
+  svn_boolean_t censor_author;
   svn_revnum_t start_rev;
   const char *default_process;
@@ -503 +509 @@
 #ifdef VBOX
               svn_revnum_t rev_to,
+              svn_boolean_t censor_author,
 #endif /* VBOX */
               svn_boolean_t sync,
@@ -534 +541 @@
       else
 #ifdef VBOX
-        if (strncmp(key, SVN_PROP_REVISION_AUTHOR,
-                    sizeof(SVN_PROP_REVISION_AUTHOR) - 1))
+        if (   (!censor_author || strncmp(key, SVN_PROP_REVISION_AUTHOR,
+                                          sizeof(SVN_PROP_REVISION_AUTHOR) - 1))
+            && ((rev_to != 1) || (rev == rev_to) || strncmp(key, SVN_PROP_REVISION_LOG,
+                                                            sizeof(SVN_PROP_REVISION_LOG)-1)))
           SVN_ERR(svn_ra_change_rev_prop2(to_session, rev_to, key, NULL, val, subpool));
 #else /* !VBOX */
@@ -631 +640 @@
   void *wrapped_edit_baton;
   svn_ra_session_t *from_session_prop;
+  svn_boolean_t censor_author;
   svn_revnum_t current;
   const char *default_process;
@@ -666 +676 @@
 
   DX(fprintf(stderr, "init set_target_revision %ld\n", target_revision);)
+  target_revision = 1;
+  DX(fprintf(stderr, "init override set_target_revision %ld\n", target_revision);)
   SVN_ERR(eb->wrapped_editor->set_target_revision(eb->wrapped_edit_baton,
                                                   target_revision, pool));
@@ -681 +693 @@
   initdir_baton_t *db = apr_pcalloc(pool, sizeof(*db));
 
-  DX(fprintf(stderr, "init open_root\n");)
+  DX(fprintf(stderr, "init open_root %ld\n", base_revision);)
+  base_revision = 1;
+  DX(fprintf(stderr, "init override open_root %ld\n", base_revision);)
   SVN_ERR(get_props_sync(eb->from_session_prop, eb->default_process, TRUE,
                          FALSE,"", eb->current, &db->process,
@@ -688 +702 @@
   if (db->process)
     SVN_ERR(eb->wrapped_editor->open_root(eb->wrapped_edit_baton,
-                                          base_revision, pool,
+                                          base_revision - 1, pool,
                                           &db->wrapped_dir_baton));
 
@@ -928 +942 @@
                 svn_ra_session_t *prop_session,
                 const char *default_process,
+                svn_boolean_t censor_author,
                 svn_boolean_t replace_externals,
                 svn_boolean_t replace_license,
@@ -974 +989 @@
   apr_hash_t *config;
 #ifdef VBOX
+  svn_boolean_t censor_author;
   svn_revnum_t start_rev;
   const char *default_process;
@@ -1090 +1106 @@
                                   svn_string_create(default_process, pool),
                                   pool));
+  if (baton->censor_author)
+    SVN_ERR(svn_ra_change_rev_prop2(to_session, 0,
+                                    SVNSYNC_PROP_CENSOR_AUTHOR, NULL,
+                                    svn_string_create("", pool), pool));
   if (baton->replace_externals)
     SVN_ERR(svn_ra_change_rev_prop2(to_session, 0,
@@ -1107 +1127 @@
 
 #ifdef VBOX
-  SVN_ERR(copy_revprops(from_session, to_session, 0, 0, FALSE, pool));
+  SVN_ERR(copy_revprops(from_session, to_session, 0, 0, baton->censor_author, FALSE, pool));
 #else /* !VBOX */
   SVN_ERR(copy_revprops(from_session, to_session, 0, FALSE, pool));
@@ -1145 +1165 @@
     SVN_ERR(get_init_editor(commit_editor, commit_baton, baton->start_rev,
                             from_session_prop, baton->default_process,
+                            baton->censor_author,
                             baton->replace_externals, baton->replace_license,
                             &init_editor, &init_baton, pool));
@@ -1161 +1182 @@
     SVN_ERR(reporter->finish_report(report_baton, pool));
   }
+
+  /* Finally, copy all non-svnsync revprops from rev start_rev of the source
+     repos into rev 1 of the dest repos. */
+
+  SVN_ERR(copy_revprops(from_session, to_session, baton->start_rev, 1, baton->censor_author, FALSE, pool));
 #endif /* VBOX */
 
@@ -1196 +1222 @@
   baton.start_rev = opt_baton->start_rev;
   baton.default_process = opt_baton->default_process;
+  baton.censor_author = opt_baton->censor_author;
   baton.replace_externals = opt_baton->replace_externals;
   baton.replace_license = opt_baton->replace_license;
@@ -2396 +2423 @@
  * which records the most recently synchronized revision.
 *** VBOX
- * Set START_REV_STR to the properly which records the starting revision.
+ * Set START_REV_STR to the property which records the starting revision.
 *** VBOX
  *
@@ -2488 +2515 @@
   svn_revnum_t to_latest, copying, last_merged;
 #ifdef VBOX
+  svn_string_t *censor_author_str;
+  svn_boolean_t censor_author;
   svn_revnum_t start_rev;
   svn_string_t *from_url;
@@ -2510 +2539 @@
   if (!default_process)
     default_process = svn_string_create("export", pool);
+  SVN_ERR(svn_ra_rev_prop(to_session, 0, SVNSYNC_PROP_CENSOR_AUTHOR,
+                          &censor_author_str, pool));
+  censor_author = !!censor_author_str;
   SVN_ERR(svn_ra_rev_prop(to_session, 0, SVNSYNC_PROP_REPLACE_EXTERNALS,
                           &replace_externals_str, pool));
@@ -2586 +2618 @@
 /** @todo fix use of from/to revision numbers. */
               SVN_ERR(copy_revprops(from_session, to_session,
-                                    to_latest, to_latest, TRUE, pool));
+                                    to_latest, to_latest, censor_author, TRUE, pool));
 #else /* !VBOX */
               SVN_ERR(copy_revprops(from_session, to_session,
@@ -2769 +2801 @@
       {
         SVN_ERR(copy_revprops(from_session, to_session, current,
-                              baton->committed_rev, TRUE, subpool));
+                              baton->committed_rev, censor_author, TRUE, subpool));
 
         /* Add a revision cross-reference revprop visible to the public. */
@@ -2924 +2956 @@
 #ifdef VBOX
   svn_revnum_t start_rev;
+  svn_string_t *censor_author_str;
+  svn_boolean_t censor_author;
 #endif /* VBOX */
 
@@ -2934 +2968 @@
       (APR_EINVAL, NULL, _("Cannot copy revprops for repositories using "
                            "the start-rev feature (unimplemented)"));
+
+  SVN_ERR(svn_ra_rev_prop(to_session, 0, SVNSYNC_PROP_CENSOR_AUTHOR,
+                          &censor_author_str, pool));
+  censor_author = !!censor_author_str;
 #else /* !VBOX */
   SVN_ERR(open_source_session(&from_session, &last_merged_rev, to_session,
@@ -2945 +2983 @@
 
 #ifdef VBOX
-  SVN_ERR(copy_revprops(from_session, to_session, baton->rev, baton->rev, FALSE, pool));
+  SVN_ERR(copy_revprops(from_session, to_session, baton->rev, baton->rev, censor_author, FALSE, pool));
 #else /* !VBOX */
   SVN_ERR(copy_revprops(from_session, to_session, baton->rev, FALSE, pool));
@@ -3155 +3193 @@
 
 #ifdef VBOX
+          case svnsync_opt_censor_author:
+            opt_baton.censor_author = TRUE;
+            break;
+
           case svnsync_opt_start_rev:
             opt_baton.start_rev = SVN_STR_TO_REV(opt_arg);