diff --git a/manic/checkout.py b/manic/checkout.py index 9229f69..a920604 100755 --- a/manic/checkout.py +++ b/manic/checkout.py @@ -218,9 +218,9 @@ def commandline_arguments(args=None): parser.add_argument('-v', '--verbose', action='count', default=0, help='Output additional information to ' - 'the screen and log file. For --status, this flag ' - 'can be used a second time, increasing the verbosity' - 'level each time.') + 'the screen and log file. This flag can be ' + 'used up to two times, increasing the ' + 'verbosity level each time.') # # developer options diff --git a/manic/sourcetree.py b/manic/sourcetree.py index 4a8ea33..1f2d5a5 100644 --- a/manic/sourcetree.py +++ b/manic/sourcetree.py @@ -173,8 +173,15 @@ def checkout(self, verbosity, load_all): self._stat.log_status_message(VERBOSITY_VERBOSE) if self._repo: + if self._stat.sync_state == ExternalStatus.STATUS_OK: + # If we're already in sync, avoid showing verbose output + # from the checkout command, unless the verbosity level + # is 2 or more. + checkout_verbosity = verbosity - 1 + else: + checkout_verbosity = verbosity self._repo.checkout(self._base_dir_path, - self._repo_dir_name, verbosity) + self._repo_dir_name, checkout_verbosity) def checkout_externals(self, verbosity, load_all): """Checkout the sub-externals for this object