# HG changeset patch
# User wenzelm
# Date 1678026840 -3600
# Node ID fda4da0f80f4cd8314c61d4c8aae2cf259f91766
# Parent  ede77a627b3a4ef648c6af32e2e96571f78d49c8
clarified signature: manage "verbose" flag via "progress";

diff -r ede77a627b3a -r fda4da0f80f4 src/Pure/General/mercurial.scala
--- a/src/Pure/General/mercurial.scala	Sun Mar 05 15:25:02 2023 +0100
+++ b/src/Pure/General/mercurial.scala	Sun Mar 05 15:34:00 2023 +0100
@@ -294,7 +294,6 @@
     def known_files(): List[String] = status(options = "--modified --added --clean --no-status")
 
     def sync(context: Rsync.Context, target: String,
-      verbose: Boolean = false,
       thorough: Boolean = false,
       dry_run: Boolean = false,
       filter: List[String] = Nil,
@@ -348,7 +347,6 @@
           (Hg_Sync.PATH :: contents.map(_.path))
             .map(path => "protect /" + File.standard_path(path))
         Rsync.exec(context,
-          verbose = verbose,
           thorough = thorough,
           dry_run = dry_run,
           clean = true,
@@ -604,7 +602,7 @@
             case _ => getopts.usage()
           }
 
-        val progress = new Console_Progress
+        val progress = new Console_Progress(verbose = verbose)
         val hg =
           root match {
             case Some(dir) => repository(dir)
@@ -612,8 +610,7 @@
           }
         val context = Rsync.Context(progress, ssh_port = ssh_port,
           ssh_control_path = ssh_control_path, protect_args = protect_args)
-        hg.sync(context, target, verbose = verbose, thorough = thorough,
-          dry_run = dry_run, filter = filter, rev = rev)
+        hg.sync(context, target, thorough = thorough, dry_run = dry_run, filter = filter, rev = rev)
       }
     )
 }
diff -r ede77a627b3a -r fda4da0f80f4 src/Pure/General/rsync.scala
--- a/src/Pure/General/rsync.scala	Sun Mar 05 15:25:02 2023 +0100
+++ b/src/Pure/General/rsync.scala	Sun Mar 05 15:34:00 2023 +0100
@@ -24,7 +24,6 @@
 
   def exec(
     context: Context,
-    verbose: Boolean = false,
     thorough: Boolean = false,
     prune_empty_dirs: Boolean = false,
     dry_run: Boolean = false,
@@ -36,7 +35,7 @@
     val progress = context.progress
     val script =
       context.command +
-        (if (verbose) " --verbose" else "") +
+        (if (progress.verbose) " --verbose" else "") +
         (if (thorough) " --ignore-times" else " --omit-dir-times") +
         (if (prune_empty_dirs) " --prune-empty-dirs" else "") +
         (if (dry_run) " --dry-run" else "") +
diff -r ede77a627b3a -r fda4da0f80f4 src/Pure/Tools/sync.scala
--- a/src/Pure/Tools/sync.scala	Sun Mar 05 15:25:02 2023 +0100
+++ b/src/Pure/Tools/sync.scala	Sun Mar 05 15:34:00 2023 +0100
@@ -34,7 +34,6 @@
   /* sync */
 
   def sync(options: Options, context: Rsync.Context, target: String,
-    verbose: Boolean = false,
     thorough: Boolean = false,
     purge_heaps: Boolean = false,
     session_images: List[String] = Nil,
@@ -54,18 +53,18 @@
     def sync(hg: Mercurial.Repository, dest: String, r: String,
       contents: List[File.Content] = Nil, filter: List[String] = Nil
     ): Unit = {
-      hg.sync(context, dest, rev = r, verbose = verbose, thorough = thorough, dry_run = dry_run,
+      hg.sync(context, dest, rev = r, thorough = thorough, dry_run = dry_run,
         contents = contents, filter = filter ::: more_filter)
     }
 
-    progress.echo_if(verbose, "\n* Isabelle repository:")
+    progress.echo("\n* Isabelle repository:", verbose = true)
     val filter_heaps = if (purge_heaps) Nil else List("protect /heaps", "protect /heaps/**")
     sync(hg, target, rev,
       contents = List(File.content(Path.explode("etc/ISABELLE_ID"), hg.id(rev = rev))),
       filter = filter_heaps ::: List("protect /AFP"))
 
     for (hg <- afp_hg) {
-      progress.echo_if(verbose, "\n* AFP repository:")
+      progress.echo("\n* AFP repository:", verbose = true)
       sync(hg, Url.append_path(target, "AFP"), afp_rev)
     }
 
@@ -73,9 +72,9 @@
       find_images(options, session_images,
         dirs = afp_root.map(_ + Path.explode("thys")).toList)
     if (images.nonEmpty) {
-      progress.echo_if(verbose, "\n* Session images:")
+      progress.echo("\n* Session images:", verbose = true)
       val heaps = Url.append_path(target, "heaps/")
-      Rsync.exec(context, verbose = verbose, thorough = thorough, dry_run = dry_run,
+      Rsync.exec(context, thorough = thorough, dry_run = dry_run,
         args = List("--relative", "--") ::: images ::: List(heaps)).check
     }
   }
@@ -137,13 +136,13 @@
           }
 
         val options = Options.init()
-        val progress = new Console_Progress
+        val progress = new Console_Progress(verbose = verbose)
         val context =
           Rsync.Context(progress, ssh_port = ssh_port, ssh_control_path = ssh_control_path,
             protect_args = protect_args)
-        sync(options, context, target, verbose = verbose, thorough = thorough,
-          purge_heaps = purge_heaps, session_images = session_images, preserve_jars = preserve_jars,
-          dry_run = dry_run, rev = rev, afp_root = afp_root, afp_rev = afp_rev)
+        sync(options, context, target, thorough = thorough, purge_heaps = purge_heaps,
+          session_images = session_images, preserve_jars = preserve_jars, dry_run = dry_run,
+          rev = rev, afp_root = afp_root, afp_rev = afp_rev)
       }
     )
 }