gclient: make sync more verbose on git

gclient_scm.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 115 matching lines @@
       raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
 
     components = self.url.split("@")
     url = components[0]
     revision = None
     if options.revision:
       revision = options.revision
     elif len(components) == 2:
       revision = components[1]
 
+    if options.verbose:
+      rev_str = ""
+      if revision:
+        rev_str = ' at %s' % revision
+      print("\n_____ %s%s" % (self.relpath, rev_str))
+
     if not os.path.exists(self.checkout_path):
       self._RunGit(['clone', url, self.checkout_path],
                    cwd=self._root_dir, redirect_stdout=False)
       if revision:
         self._RunGit(['reset', '--hard', revision], redirect_stdout=False)
       files =  self._RunGit(['ls-files']).split()
       file_list.extend([os.path.join(self.checkout_path, f) for f in files])
       return
 
     self._RunGit(['remote', 'update'], redirect_stdout=False)
     new_base = 'origin'
     if revision:
       new_base = revision
     files = self._RunGit(['diff', new_base, '--name-only']).split()
     file_list.extend([os.path.join(self.checkout_path, f) for f in files])
-    self._RunGit(['rebase', new_base], redirect_stdout=False)
+    self._RunGit(['rebase', '-v', new_base], redirect_stdout=False)

[M-A Ruel, 2009/11/06 22:56:14]

Shouldn't -v only when options.verbose?

+    print "Checked out revision %s." % self.revinfo(options, (), None)
 
   def revert(self, options, args, file_list):
     """Reverts local modifications.
 
     All reverted files will be appended to file_list.
     """
     path = os.path.join(self._root_dir, self.relpath)
     if not os.path.isdir(path):
       # revert won't work if the directory doesn't exist. It needs to
       # checkout instead.
@@ skipping 615 matching lines @@
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
         # Col 4
         if wc_status[0].getAttribute('switched') == 'true':
           statuses[4] = 'S'
         # TODO(maruel): Col 5 and 6
         item = (''.join(statuses), file)
         results.append(item)
   return results