cros_mark_as_stable: modify push to use tracking branch

cros_mark_as_stable.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS 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 uprevs a given package's ebuild to the next revision."""
 
 
 import fileinput
@@ skipping 18 matching lines @@
                      empty commit id's.""",
                      short_name='i')
 gflags.DEFINE_string('packages', '',
                      'Space separated list of packages to mark as stable.',
                      short_name='p')
 gflags.DEFINE_string('push_options', '',
                      'Options to use with git-cl push using push command.')
 gflags.DEFINE_string('srcroot',  '%s/trunk/src' % os.environ['HOME'],
                      'Path to root src directory.',
                      short_name='r')
 gflags.DEFINE_string('tracking_branch', 'origin',

[Nasser Grainawi, 2010/08/05 18:39:48]

You should really be explicit here and use 'origin/master'. 'origin' isn't a
branch, it's a remote.

                      'Used with commit to specify branch to track against.',
                      short_name='t')
 gflags.DEFINE_boolean('verbose', False,
                       'Prints out verbose information about what is going on.',
                       short_name='v')
 
 
 # Takes two strings, package_name and commit_id.
 _GIT_COMMIT_MESSAGE = \
   'Marking 9999 ebuild for %s with commit %s as stable.'
@@ skipping 74 matching lines @@
   # TODO(sosa) - Add logic for buildbot to check whether other slaves have
   # completed and push this change only if they have.
 
   # Sanity check to make sure we're on a stabilizing branch before pushing.
   if not _CheckOnStabilizingBranch():
     generate_test_report.Die('Expected %s to be on branch "%s"' %
                              (os.getcwd(), _STABLE_BRANCH_NAME))
   _RunCommand('git cl upload --desc_from_logs -m "%s"' %
     'Marking set of ebuilds as stable')
   _RunCommand('git remote update')
-  _RunCommand('git rebase origin/master')
+  _RunCommand('git rebase %s' % gflags.FLAGS.tracking_branch)
   _RunCommand('git cl push %s' % gflags.FLAGS.push_options)
 
 
 def _RunCommand(command):
   """Runs a shell command and returns stdout back to caller."""
   _Print('  + %s' % command)
   proc_handle = subprocess.Popen(command, stdout=subprocess.PIPE, shell=True)
   return proc_handle.communicate()[0]
 
 
@@ skipping 214 matching lines @@
              'and reset the git repo yourself.' %
              (package_list[:index], overlay_directory))
       raise e
   elif command == 'push':
     _PushChange()
 
 
 if __name__ == '__main__':
   main(sys.argv)