Simplify and clearify push logic.

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 234 matching lines @@
     Info('Not on branch %s so no work found to push.  Exiting' % stable_branch)
     return
 
   description = _SimpleRunCommand('git log --format=format:%s%n%n%b ' +
                                   tracking_branch + '..')
   description = 'Marking set of ebuilds as stable\n\n%s' % description
   Info('Using description %s' % description)
   merge_branch_name = 'merge_branch'
   for push_try in range(num_retries + 1):
     try:
-      _SimpleRunCommand('git remote update')
+      _SimpleRunCommand('repo sync .')
       merge_branch = GitBranch(merge_branch_name, tracking_branch)
       merge_branch.CreateBranch()
       if not merge_branch.Exists():
         Die('Unable to create merge branch.')
       _SimpleRunCommand('git merge --squash %s' % stable_branch)
       _SimpleRunCommand('git commit -m "%s"' % description)
       _SimpleRunCommand('git config push.default tracking')
       if gflags.FLAGS.dryrun:
         _SimpleRunCommand('git push --dry-run')
       else:
@@ skipping 311 matching lines @@
         if gflags.FLAGS.drop_file:
           fh = open(gflags.FLAGS.drop_file, 'w')
           fh.write(' '.join(revved_packages))
           fh.close()
       else:
         work_branch.Delete()
 
 
 if __name__ == '__main__':
   main(sys.argv)