Make push and clean more robust.

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 209 matching lines @@
 
 # ======================= End Global Helper Functions ========================
 
 
 def Clean(tracking_branch):
   """Cleans up uncommitted changes.
 
   Args:
     tracking_branch:  The tracking branch we want to return to after the call.
   """
+  # Safety case in case we got into a bad state with a previous build.
+  try:
+    _SimpleRunCommand('git rebase --abort')
+  except:
+    pass
+
   _SimpleRunCommand('git reset HEAD --hard')
   branch = GitBranch(STABLE_BRANCH_NAME, tracking_branch)
   if branch.Exists():
     GitBranch.Checkout(branch)
     branch.Delete()
 
 
 def PushChange(stable_branch, tracking_branch):
   """Pushes commits in the stable_branch to the remote git repository.
 
@@ skipping 13 matching lines @@
     Info('Not work found to push.  Exiting')
     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('repo sync .')
       merge_branch = GitBranch(merge_branch_name, tracking_branch)
       if merge_branch.Exists():
         merge_branch.Delete()
+      _SimpleRunCommand('repo sync .')
       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:
         _SimpleRunCommand('git push')
@@ skipping 15 matching lines @@
     self.branch_name = branch_name
     self.tracking_branch = tracking_branch
 
   def CreateBranch(self):
     GitBranch.Checkout(self)
 
   @classmethod
   def Checkout(cls, target):
     """Function used to check out to another GitBranch."""
     if target.branch_name == target.tracking_branch or target.Exists():
-      git_cmd = 'git checkout %s' % target.branch_name
+      git_cmd = 'git checkout %s -f' % target.branch_name
     else:
-      git_cmd = 'git checkout -b %s %s' % (target.branch_name,
-                                           target.tracking_branch)
+      git_cmd = 'git checkout -b %s %s -f' % (target.branch_name,
+                                              target.tracking_branch)
     _SimpleRunCommand(git_cmd)
 
   def Exists(self):
     """Returns True if the branch exists."""
     branch_cmd = 'git branch'
     branches = _SimpleRunCommand(branch_cmd)
     return self.branch_name in branches.split()
 
   def Delete(self):
     """Deletes the branch and returns the user to the master branch.
@@ skipping 266 matching lines @@
 
       _CleanStalePackages(gflags.FLAGS.board, new_package_atoms)
       if gflags.FLAGS.drop_file:
         fh = open(gflags.FLAGS.drop_file, 'w')
         fh.write(' '.join(revved_packages))
         fh.close()
 
 
 if __name__ == '__main__':
   main(sys.argv)