Revert of Consolidated 'git' refish parsing into a class

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 1094 matching lines @@
     self._root_dir = root_dir
     self.config_content = None
 
   def _CheckConfig(self):
     """Verify that the config matches the state of the existing checked-out
     solutions."""
     for dep in self.dependencies:
       if dep.managed and dep.url:
         scm = gclient_scm.CreateSCM(
             dep.url, self.root_dir, dep.name, self.outbuf)
-        actual_url = scm.GetActualRemoteURL()
+        actual_url = scm.GetActualRemoteURL(self._options)
         if actual_url and not scm.DoesRemoteURLMatch(self._options):
           raise gclient_utils.Error('''
 Your .gclient file seems to be broken. The requested URL is different from what
 is actually checked out in %(checkout_path)s.
 
 The .gclient file contains:
 %(expected_url)s (%(expected_scm)s)
 
 The local checkout in %(checkout_path)s reports:
 %(actual_url)s (%(actual_scm)s)
@@ skipping 919 matching lines @@
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
   finally:
     gclient_utils.PrintWarnings()
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: