safely-roll-deps: print every command

tools/safely-roll-deps.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Generate a CL to roll a DEPS entry to the specified revision number and post
 it to Rietveld so that the CL will land automatically if it passes the
 commit-queue's checks.
 """
 
@@ skipping 27 matching lines @@
   new_content = re.sub(old_line, new_line, content, 1)
   old_rev = re.search(old_line, content).group(2)
   if not old_rev or new_content == content:
     die_with_error('Failed to update the DEPS file')
 
   if not is_dry_run:
     open(path, 'w').write(new_content)
   return old_rev
 
 
+class PrintSubprocess(object):
+  """Wrapper for subprocess2 which prints out every command."""
+  def __getattr__(self, attr):
+    def _run_subprocess2(cmd, *args, **kwargs):
+      print cmd

[M-A Ruel, 2014/05/02 16:34:41]

you'll want to sys.stdout.flush()

[borenet, 2014/05/02 19:51:15]

Done.

+      return getattr(subprocess2, attr)(cmd, *args, **kwargs)
+    return _run_subprocess2
+
+prnt_subprocess = PrintSubprocess()
+
+
 def main():
   tool_dir = os.path.dirname(os.path.abspath(__file__))
   parser = optparse.OptionParser(usage='%prog [options] <project> <new rev>',
                                  description=sys.modules[__name__].__doc__)
   parser.add_option('-v', '--verbose', action='count', default=0)
   parser.add_option('--dry-run', action='store_true')
   parser.add_option('-f', '--force', action='store_true',
                     help='Make destructive changes to the local checkout if '
                          'necessary.')
   parser.add_option('--commit', action='store_true', default=True,
@@ skipping 22 matching lines @@
   root_dir = os.path.dirname(tool_dir)
   os.chdir(root_dir)
 
   project = args[0]
   new_rev = int(args[1])
 
   # Silence the editor.
   os.environ['EDITOR'] = 'true'
 
   if options.force and not options.dry_run:
-    subprocess2.check_call(['git', 'clean', '-d', '-f'])
-    subprocess2.call(['git', 'rebase', '--abort'])
+    prnt_subprocess.check_call(['git', 'clean', '-d', '-f'])
+    prnt_subprocess.call(['git', 'rebase', '--abort'])
 
   old_branch = scm.GIT.GetBranch(root_dir)
   new_branch = '%s_roll' % project
 
   if options.upstream == new_branch:
     parser.error('Cannot set %s as its own upstream.' % new_branch)
 
   if old_branch == new_branch:
     if options.force:
       if not options.dry_run:
-        subprocess2.check_call(['git', 'checkout', options.upstream, '-f'])
-        subprocess2.call(['git', 'branch', '-D', old_branch])
+        prnt_subprocess.check_call(['git', 'checkout', options.upstream, '-f'])
+        prnt_subprocess.call(['git', 'branch', '-D', old_branch])
     else:
       parser.error('Please delete the branch %s and move to a different branch'
                    % new_branch)
 
   if not options.dry_run:
-    subprocess2.check_call(['git', 'fetch', 'origin'])
-    subprocess2.call(['git', 'svn', 'fetch'])
+    prnt_subprocess.check_call(['git', 'fetch', 'origin'])
+    prnt_subprocess.call(['git', 'svn', 'fetch'])
     branch_cmd = ['git', 'checkout', '-b', new_branch, options.upstream]
     if options.force:
       branch_cmd.append('-f')
-    subprocess2.check_output(branch_cmd)
+    prnt_subprocess.check_output(branch_cmd)
 
   try:
     old_rev = int(process_deps(os.path.join(root_dir, 'DEPS'), project, new_rev,
                                options.dry_run))
     print '%s roll %s:%s' % (project.title(), old_rev, new_rev)
 
     review_field = 'TBR' if options.commit else 'R'
     commit_msg = options.message or '%s roll %s:%s\n' % (project.title(),
                                                          old_rev, new_rev)
     commit_msg += '\n%s=%s\n' % (review_field, options.reviewers)
 
     if options.dry_run:
       print 'Commit message: ' + commit_msg
       return 0
 
-    subprocess2.check_output(['git', 'commit', '-m', commit_msg, 'DEPS'])
-    subprocess2.check_call(['git', 'diff', '--no-ext-diff', options.upstream])
+    prnt_subprocess.check_output(['git', 'commit', '-m', commit_msg, 'DEPS'])
+    prnt_subprocess.check_call(['git', 'diff', '--no-ext-diff',
+                                options.upstream])
     upload_cmd = ['git', 'cl', 'upload']
     if options.commit:
       upload_cmd.append('--use-commit-queue')
     if options.reviewers:
       upload_cmd.append('--send-mail')
     if options.cc:
       upload_cmd.extend(['--cc', options.cc])
-    subprocess2.check_call(upload_cmd)
+    prnt_subprocess.check_call(upload_cmd)
   finally:
     if not options.dry_run:
-      subprocess2.check_output(['git', 'checkout', old_branch])
-      subprocess2.check_output(['git', 'branch', '-D', new_branch])
+      prnt_subprocess.check_output(['git', 'checkout', old_branch])
+      prnt_subprocess.check_output(['git', 'branch', '-D', new_branch])
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())