Merge lp:~bjornt/launchpad/quiet-update-sourcecode into lp:launchpad

[Björn Tillenius]

[Björn Tillenius (bjornt)]

Add a --quiet flag to update-sourcecode.py. This makes it easier to use
this script in a crontab.

[Abel Deuring (adeuring)]

review: Approve

=== modified file 'lib/devscripts/sourcecode.py'
--- lib/devscripts/sourcecode.py	2010-04-08 15:40:56 +0000
+++ lib/devscripts/sourcecode.py	2010-04-19 11:14:26 +0000
@@ -148,7 +148,7 @@
 
 
 def get_branches(sourcecode_directory, new_branches,
-                 possible_transports=None, tip=False):
+                 possible_transports=None, tip=False, quiet=False):
     """Get the new branches into sourcecode."""
     for project, (branch_url, revision, optional) in new_branches.iteritems():
         destination = os.path.join(sourcecode_directory, project)
@@ -163,8 +163,9 @@
                 raise
         possible_transports.append(
             remote_branch.bzrdir.root_transport)
-        print 'Getting %s from %s at %s' % (
-                project, branch_url, _format_revision_name(revision, tip))
+        if not quiet:
+            print 'Getting %s from %s at %s' % (
+                    project, branch_url, _format_revision_name(revision, tip))
         # If the 'optional' flag is set, then it's a branch that shares
         # history with Launchpad, so we should share repositories. Otherwise,
         # we should avoid sharing repositories to avoid format
@@ -178,7 +179,7 @@
 
 
 def update_branches(sourcecode_directory, update_branches,
-                    possible_transports=None, tip=False):
+                    possible_transports=None, tip=False, quiet=False):
     """Update the existing branches in sourcecode."""
     if possible_transports is None:
         possible_transports = []
@@ -188,8 +189,9 @@
         update_branches.iteritems()):
         # Update project from branch_url.
         destination = os.path.join(sourcecode_directory, project)
-        print 'Updating %s to %s' % (
-                project, _format_revision_name(revision, tip))
+        if not quiet:
+            print 'Updating %s to %s' % (
+                    project, _format_revision_name(revision, tip))
         local_tree = WorkingTree.open(destination)
         try:
             remote_branch = Branch.open(
@@ -220,21 +222,24 @@
                 remote_branch, stop_revision=revision_id, overwrite=True,
                 possible_transports=possible_transports)
         if result.old_revid == result.new_revid:
-            print '  (No change)'
+            if not quiet:
+                print '  (No change)'
         else:
             if result.old_revno < result.new_revno:
                 change = 'Updated'
             else:
                 change = 'Reverted'
-            print '  (%s from %s to %s)' % (
-                change, result.old_revno, result.new_revno)
-
-
-def remove_branches(sourcecode_directory, removed_branches):
+            if not quiet:
+                print '  (%s from %s to %s)' % (
+                    change, result.old_revno, result.new_revno)
+
+
+def remove_branches(sourcecode_directory, removed_branches, quiet=False):
     """Remove sourcecode that's no longer there."""
     for project in removed_branches:
         destination = os.path.join(sourcecode_directory, project)
-        print 'Removing %s' % project
+        if not quiet:
+            print 'Removing %s' % project
         try:
             shutil.rmtree(destination)
         except OSError:
@@ -242,7 +247,7 @@
 
 
 def update_sourcecode(sourcecode_directory, config_filename, public_only,
-                      tip, dry_run):
+                      tip, dry_run, quiet=False):
     """Update the sourcecode."""
     config_file = open(config_filename)
     config = interpret_config(parse_config_file(config_file), public_only)
@@ -255,9 +260,11 @@
         print 'Branches to update:', updated.keys()
         print 'Branches to remove:', list(removed)
     else:
-        get_branches(sourcecode_directory, new, possible_transports, tip)
-        update_branches(sourcecode_directory, updated, possible_transports, tip)
-        remove_branches(sourcecode_directory, removed)
+        get_branches(
+            sourcecode_directory, new, possible_transports, tip, quiet)
+        update_branches(
+            sourcecode_directory, updated, possible_transports, tip, quiet)
+        remove_branches(sourcecode_directory, removed, quiet)
 
 
 # XXX: JonathanLange 2009-09-11: By default, the script will operate on the
@@ -282,6 +289,9 @@
     parser.add_option(
         '--dry-run', action='store_true',
         help='Do nothing, but report what would have been done.')
+    parser.add_option(
+        '--quiet', action='store_true',
+        help="Don't print informational messages.")
     options, args = parser.parse_args(args)
     root = get_launchpad_root()
     if len(args) > 1:
@@ -294,8 +304,9 @@
         config_filename = os.path.join(root, 'utilities', 'sourcedeps.conf')
     if len(args) > 3:
         parser.error("Too many arguments.")
-    print 'Sourcecode: %s' % (sourcecode_directory,)
-    print 'Config: %s' % (config_filename,)
+    if not options.quiet:
+        print 'Sourcecode: %s' % (sourcecode_directory,)
+        print 'Config: %s' % (config_filename,)
     enable_default_logging()
     # Tell bzr to use the terminal (if any) to show progress bars
     ui.ui_factory = ui.make_ui_for_terminal(
@@ -303,5 +314,5 @@
     load_plugins()
     update_sourcecode(
         sourcecode_directory, config_filename,
-        options.public_only, options.tip, options.dry_run)
+        options.public_only, options.tip, options.dry_run, options.quiet)
     return 0