@@ -34,6 +34,10 @@ module Braid @config ||= load_and_migrate_config end + def verbose? + Braid.verbose + end + private def setup_remote(mirror) Command.run(:setup, mirror.path) lib/braid/command.rb @@ -27,7 +27,7 @@ module Braid # check options for lock modification if mirror.locked? if options["head"] - msg "Unlocking mirror '#{mirror.path}'." + msg "Unlocking mirror '#{mirror.path}'." if verbose? mirror.lock = nil elsif !options["revision"] msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force." @@ -36,14 +36,14 @@ module Braid end setup_remote(mirror) - msg "Fetching new commits for '#{mirror.path}'." + msg "Fetching new commits for '#{mirror.path}'." if verbose? mirror.fetch new_revision = validate_new_revision(mirror, options["revision"]) target_revision = determine_target_revision(mirror, new_revision) if mirror.merged?(target_revision) - msg "Mirror '#{mirror.path}' is already up to date. Skipping." + msg "Mirror '#{mirror.path}' is already up to date." return end @@ -55,7 +55,7 @@ module Braid mirror.revision = new_revision mirror.lock = new_revision if options["revision"] - msg "Merging in mirror '#{mirror.path}'." + msg "Merging in mirror '#{mirror.path}'." if verbose? begin if mirror.squashed? local_hash = git.rev_parse("HEAD") lib/braid/commands/update.rb fa4d117764c185653764d3f920b5cb61f0f5abb9 Cristi Balan evil@che.lu http://github.com/norbert/braid/commit/be8b19e27b1c1d0e02a4324cb530228386ad0f00 be8b19e27b1c1d0e02a4324cb530228386ad0f00 2008-10-29T06:29:42-07:00 2008-10-29T06:29:42-07:00 make less verbose by default 97b1509572b66cfb05e5f0f95a30972fe93d598e Cristi Balan evil@che.lu