Modify scm.GIT.GetUpstreamBranch to behave like git-cl.

gclient_scm.py

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 219 matching lines @@
     # 1) current branch based on a hash (could be git-svn)
     #   - try to rebase onto the new upstream (hash or branch)
     # 2) current branch based on a remote branch with local committed changes,
     #    but the DEPS file switched to point to a hash
     #   - rebase those changes on top of the hash
     # 3) current branch based on a remote with or without changes, no switch
     #   - see if we can FF, if not, prompt the user for rebase, merge, or stop
     # 4) current branch based on a remote, switches to a new remote
     #   - exit
 
-    # GetUpstream returns something like 'refs/remotes/origin/master' for a
-    # tracking branch
+    # GetUpstreamBranch returns something like 'refs/remotes/origin/master' for
+    # a tracking branch
     # or 'master' if not a tracking branch (it's based on a specific rev/hash)
     # or it returns None if it couldn't find an upstream
-    upstream_branch = scm.GIT.GetUpstream(self.checkout_path)
+    upstream_branch = scm.GIT.GetUpstreamBranch(self.checkout_path)
     if not upstream_branch or not upstream_branch.startswith('refs/remotes'):
       current_type = "hash"
       logging.debug("Current branch is based off a specific rev and is not "
                     "tracking an upstream.")
     elif upstream_branch.startswith('refs/remotes'):
       current_type = "branch"
     else:
       raise gclient_utils.Error('Invalid Upstream')
 
     # Update the remotes first so we have all the refs.
@@ skipping 595 matching lines @@
       print("\n________ couldn't run \'%s\' in \'%s\':\nThe directory "
             "does not exist."
             % (' '.join(command), path))
       # There's no file list to retrieve.
     else:
       scm.SVN.RunAndGetFileList(options, command, path, file_list)
 
   def FullUrlForRelativeUrl(self, url):
     # Find the forth '/' and strip from there. A bit hackish.
     return '/'.join(self.url.split('/')[:4]) + url