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

tests/scm_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Unit tests for scm.py."""
 
 from shutil import rmtree
 import tempfile
 
@@ skipping 104 matching lines @@
     rmtree(self.root_dir)
     SuperMoxBaseTestBase.tearDown(self)
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'COMMAND', 'AssertVersion', 'Capture', 'CaptureStatus',
         'FetchUpstreamTuple',
         'GenerateDiff', 'GetBranch', 'GetBranchRef', 'GetCheckoutRoot',
         'GetDifferentFiles', 'GetEmail', 'GetPatchName', 'GetSVNBranch',
-        'GetUpstream', 'IsGitSvn', 'RunAndFilterOutput', 'ShortBranchName',
+        'GetUpstreamBranch', 'IsGitSvn', 'RunAndFilterOutput',
+        'ShortBranchName',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.GIT, members)
 
   def testGetEmail(self):
     self.mox.StubOutWithMock(scm.GIT, 'Capture')
     scm.GIT.Capture(['config', 'user.email'], self.fake_root, error_ok=True
                     ).AndReturn(['mini@me.com', ''])
     self.mox.ReplayAll()
     self.assertEqual(scm.GIT.GetEmail(self.fake_root), 'mini@me.com')
@@ skipping 189 matching lines @@
     self.mox.ReplayAll()
     info = scm.SVN.CaptureStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: