Add verbose option to misc.ChDir

py/utils/misc.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """ This module contains miscellaneous tools used by the buildbot scripts. """
 
 import os
 
 from git_utils import GIT
@@ skipping 49 matching lines @@
   path_parts = relative_path.split(os.sep)
   abs_path = os.path.abspath('.')
   for path_part in path_parts:
     abs_path = os.path.abspath(os.path.join(abs_path, path_part))
   return abs_path
 
 
 class ChDir(object):
   """Enter and exit the given directory appropriately."""
 
-  def __init__(self, directory):
+  def __init__(self, directory, verbose=True):
     """Instantiate the ChDir.
 
     Args:
         directory: string; the directory to enter.
+        verbose: bool; whether or not to log the directory changes.

[rmistry, 2014/06/23 14:08:15]

nit: log -> print. log may mean you are using the logging module (which may be
better to do here but this is minor).

[borenet, 2014/06/23 14:16:40]

Done.

     """
     self._destination = directory
     self._origin = None
+    self._verbose = verbose
 
   def __enter__(self):
     """Change to the destination directory.
 
     Does not check whether the directory exists.
     """
     self._origin = os.getcwd()
-    print 'chdir %s' % self._destination
+    if self._verbose:
+      print 'chdir %s' % self._destination
     os.chdir(self._destination)
 
   def __exit__(self, *args):
     """Change back to the original directory."""
-    print 'chdir %s' % self._origin
+    if self._verbose:
+      print 'chdir %s' % self._origin
     os.chdir(self._origin)
 
 
 class GitBranch(object):
   """Class to manage git branches.
 
   This class allows one to create a new branch in a repository to make changes,
   then it commits the changes, switches to master branch, and deletes the
   created temporary branch upon exit.
   """
@@ skipping 28 matching lines @@
   def __exit__(self, exc_type, _value, _traceback):
     if self._upload:
       # Only upload if no error occurred.
       try:
         if exc_type is None:
           self.commit_and_upload(use_commit_queue=self._commit_queue)
       finally:
         shell_utils.run([GIT, 'checkout', 'master'])
         shell_utils.run([GIT, 'branch', '-D', self._branch_name])