rebaseline.py: look in gm-expected directory to see whether it's using git or svn

tools/rebaseline_imagefiles.py

 #!/usr/bin/python
 
 '''
 Copyright 2013 Google Inc.
 
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 '''
 
 '''
@@ skipping 64 matching lines @@
         self._configs = configs
         self._json_base_url = json_base_url
         self._json_filename = json_filename
         self._dry_run = dry_run
         self._add_new = add_new
         self._missing_json_is_fatal = missing_json_is_fatal
         self._googlestorage_gm_actuals_root = (
             'http://chromium-skia-gm.commondatastorage.googleapis.com/gm')
         self._testname_pattern = re.compile('(\S+)_(\S+).png')
         self._is_svn_checkout = (
-            os.path.exists('.svn') or
-            os.path.exists(os.path.join(os.pardir, '.svn')))
+            os.path.exists(os.path.join(expectations_root, '.svn')) or
+            os.path.exists(os.path.join(expectations_root, os.pardir, '.svn')))
         self._is_git_checkout = (
-            os.path.exists('.git') or
-            os.path.exists(os.path.join(os.pardir, '.git')))
+            os.path.exists(os.path.join(expectations_root, '.git')) or
+            os.path.exists(os.path.join(expectations_root, os.pardir, '.git')))
 
     # If dry_run is False, execute subprocess.call(cmd).
     # If dry_run is True, print the command we would have otherwise run.
     # Raises a CommandFailedException if the command fails.
     def _Call(self, cmd):
         if self._dry_run:
             print '%s' % ' '.join(cmd)
             return
         if subprocess.call(cmd) != 0:
             raise CommandFailedException('error running command: ' +
@@ skipping 232 matching lines @@
         else:  # get the raw list of files that need rebaselining from JSON
             filenames = self._GetFilesToRebaseline(json_url=json_url,
                                                    add_new=self._add_new)
             for filename in filenames:
                 outfilename = os.path.join(subdir, filename);
                 self._RebaselineOneFile(expectations_subdir=subdir,
                                         builder_name=builder,
                                         infilename=filename,
                                         outfilename=outfilename,
                                         all_results=all_results)