old_contents: # Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
  # reserved. Use of this source code is governed by a BSD-style license that
  # can be found in the LICENSE file.
  
  import svn_util as svn
  import git_util as git
  import sys
  
  # cannot be loaded as a module
  if __name__ != "__main__":
      sys.stderr.write('This file cannot be loaded as a module!')
      sys.exit()
  
  try:
    sys.stdout.write(svn.get_revision())
  except:
    sys.stdout.write(git.get_svn_revision())
  
  
  
new_contents: # Copyright (c) 2012 The Chromium Embedded Framework Authors. All rights
  # reserved. Use of this source code is governed by a BSD-style license that
  # can be found in the LICENSE file.
  
  import svn_util as svn
  import git_util as git
  import os
  import sys
  
  # cannot be loaded as a module
  if __name__ != "__main__":
      sys.stderr.write('This file cannot be loaded as a module!')
      sys.exit()
  
  if os.path.exists(os.path.join('.', '.svn')):
    sys.stdout.write(svn.get_revision())
  elif os.path.exists(os.path.join('.', '.git')):
    sys.stdout.write(git.get_svn_revision())
  else:
    raise Exception('Not a valid checkout')
  
  
  
subject: Fix revision.py detection of git checkouts