Add flag to cros_mark_as_stable to specify 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 15 matching lines @@
                      """Optional list of commit ids for each package.
                      This list must either be empty or have the same length as
                      the packages list.  If not set all rev'd ebuilds will have
                      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('tracking_branch', 'origin',
+                     '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')
 
 
 # TODO(sosa):  Remove hard-coding of overlays directory once there is a better
 # way.
 _CHROMIUMOS_OVERLAYS_DIRECTORY = \
     '%s/trunk/src/third_party/chromiumos-overlay' % os.environ['HOME']
 
@@ skipping 106 matching lines @@
 
   def CreateBranch(self):
     """Creates a new git branch or replaces an existing one."""
     if self.Exists():
       self.Delete()
     self._Checkout(self.branch_name)
 
   def _Checkout(self, target, create=True):
     """Function used internally to create and move between branches."""
     if create:
-      git_cmd = 'git checkout -b %s origin' % target
+      git_cmd = 'git checkout -b %s %s' % (target, gflags.FLAGS.tracking_branch)
     else:
       git_cmd = 'git checkout %s' % target
     _RunCommand(git_cmd)
 
   def Exists(self):
     """Returns True if the branch exists."""
     branch_cmd = 'git branch'
     branches = _RunCommand(branch_cmd)
     return self.branch_name in branches.split()
 
@@ skipping 182 matching lines @@
              'and reset the git repo yourself.' %
              (package_list[:index], _CHROMIUMOS_OVERLAYS_DIRECTORY))
       raise e
   elif command == 'push':
     _PushChange()
 
 
 if __name__ == '__main__':
   main(sys.argv)