cros_mark_as_stable: use git push instead of git-cl push

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 110 matching lines @@
       OSError: Error occurred while pushing.
   """
 
   # 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')
+  description = _RunCommand('git log --format=format:%s%n%n%b ' +
+                            gflags.FLAGS.tracking_branch + '..')
+  description = 'Marking set of ebuilds as stable\n\n%s' % description
+  merge_branch_name = 'merge_branch'
   _RunCommand('git remote update')
-  _RunCommand('git rebase %s' % gflags.FLAGS.tracking_branch)
-  _RunCommand('git cl push %s' % gflags.FLAGS.push_options)
+  _RunCommand('git checkout -b %s %s' % (
+      merge_branch_name, gflags.FLAGS.tracking_branch))
+  try:
+    _RunCommand('git merge --squash %s' % _STABLE_BRANCH_NAME)
+    _RunCommand('git commit -m "%s"' % description)
+    # Ugh. There has got to be an easier way to push to a tracking branch
+    _RunCommand('git config push.default tracking')
+    _RunCommand('git push')
+  finally:
+    _RunCommand('git checkout %s' % _STABLE_BRANCH_NAME)
+    _RunCommand('git branch -D %s' % merge_branch_name)
 
 
 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]
 
 
 # ======================= End Global Helper Functions ========================
@@ skipping 213 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)