gclient: Make revinfo work on git.

tests/gclient_scm_test.py

 #!/usr/bin/python
 #
 # Copyright 2008-2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 31 matching lines @@
   def setUp(self):
     gclient_test.GClientBaseTestCase.setUp(self)
     self.root_dir = self.Dir()
     self.args = self.Args()
     self.url = self.Url()
     self.relpath = 'asf'
 
   def testDir(self):
     members = [
       'FullUrlForRelativeUrl', 'RunCommand', 'cleanup', 'diff', 'export',
-      'pack', 'relpath', 'revert', 'runhooks', 'scm_name', 'status',
+      'pack', 'relpath', 'revert', 'revinfo', 'runhooks', 'scm_name', 'status',
       'update', 'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
     self.compareMembers(self._scm_wrapper(), members)
 
   def testUnsupportedSCM(self):
     args = [self.url, self.root_dir, self.relpath]
     kwargs = {'scm_name' : 'foo'}
     exception_msg = 'Unsupported scm %(scm_name)s' % kwargs
@@ skipping 253 matching lines @@
       'Revision': 35,
       'Repository Root': self.root_dir,
       'Schedule': 'normal',
       'Copied From URL': None,
       'Copied From Rev': None,
       'Path': '.',
       'Node Kind': 'dir',
     }
     self.assertEqual(file_info, expected)
 
+  def testRevinfo(self):
+    options = self.Options(verbose=False)
+    xml_text = """<?xml version="1.0"?>
+<info>
+<entry
+   kind="dir"
+   path="."
+   revision="35">
+<url>%s</url>
+<repository>
+<root>%s</root>
+<uuid>7b9385f5-0452-0410-af26-ad4892b7a1fb</uuid>
+</repository>
+<wc-info>
+<schedule>normal</schedule>
+<depth>infinity</depth>
+</wc-info>
+<commit
+   revision="35">
+<author>maruel</author>
+<date>2008-12-04T20:12:19.685120Z</date>
+</commit>
+</entry>
+</info>
+""" % (self.url, self.root_dir)
+    gclient_scm.CaptureSVN(['info', '--xml',
+                            self.url], os.getcwd()).AndReturn(xml_text)
+    self.mox.ReplayAll()
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
+    rev_info = scm.revinfo(options, self.args, None)
+    self.assertEqual(rev_info, '35')
+
 
 class GitWrapperTestCase(gclient_test.GClientBaseTestCase):
   class OptionsObject(object):
      def __init__(self, test_case, verbose=False, revision=None):
       self.verbose = verbose
       self.revision = revision
       self.manually_grab_svn_rev = True
       self.deps_os = None
       self.force = False
       self.nohooks = False
@@ skipping 53 matching lines @@
     except WindowsError:
       # git is not available, skip this test.
       return False
     subprocess.Popen(['git', 'fast-import'], stdin=subprocess.PIPE,
                      stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
                      cwd=path).communicate(input=git_import)
     subprocess.Popen(['git', 'checkout'], stdout=subprocess.PIPE,
                      stderr=subprocess.STDOUT, cwd=path).communicate()
     return True
 
-  def GetGitRev(self, path):
-    return subprocess.Popen(['git', 'rev-parse', 'HEAD'],
-                            stdout=subprocess.PIPE,
-                            stderr=subprocess.STDOUT,
-                            cwd=path).communicate()[0].strip()
-
   def setUp(self):
     gclient_test.BaseTestCase.setUp(self)
     self.args = self.Args()
     self.url = 'git://foo'
     self.root_dir = tempfile.mkdtemp()
     self.relpath = '.'
     self.base_path = os.path.join(self.root_dir, self.relpath)
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
 
   def tearDown(self):
     shutil.rmtree(self.root_dir)
     gclient_test.BaseTestCase.tearDown(self)
 
   def testDir(self):
     members = [
       'FullUrlForRelativeUrl', 'RunCommand', 'cleanup', 'diff', 'export',
-      'relpath', 'revert', 'runhooks', 'scm_name', 'status', 'update', 'url',
+      'relpath', 'revert', 'revinfo', 'runhooks', 'scm_name', 'status',
+      'update', 'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
     self.compareMembers(gclient_scm.CreateSCM(url=self.url), members)
 
   def testRevertMissing(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = os.path.join(self.base_path, 'a')
     os.remove(file_path)
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
 
   def testRevertNone(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [])
-    self.assertEquals(self.GetGitRev(self.base_path),
+    self.assertEquals(scm.revinfo(options, self.args, None),
                       '069c602044c5388d2d15c3f875b057c852003458')
 
 
   def testRevertModified(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = os.path.join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
-    self.assertEquals(self.GetGitRev(self.base_path),
+    self.assertEquals(scm.revinfo(options, self.args, None),
                       '069c602044c5388d2d15c3f875b057c852003458')
 
   def testRevertNew(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = os.path.join(self.base_path, 'c')
     f = open(file_path, 'w')
     f.writelines('new\n')
     f.close()
     subprocess.Popen(['git', 'add', 'c'], stdout=subprocess.PIPE,
                      stderr=subprocess.STDOUT, cwd=self.base_path).communicate()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [file_path])
     file_list = []
     scm.diff(options, self.args, file_list)
     self.assertEquals(file_list, [])
-    self.assertEquals(self.GetGitRev(self.base_path),
+    self.assertEquals(scm.revinfo(options, self.args, None),
                       '069c602044c5388d2d15c3f875b057c852003458')
 
   def testStatusNew(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = os.path.join(self.base_path, 'a')
     open(file_path, 'a').writelines('touched\n')
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
@@ skipping 25 matching lines @@
     relpath = 'foo'
     base_path = os.path.join(root_dir, relpath)
     url = os.path.join(self.root_dir, self.relpath, '.git')
     try:
       scm = gclient_scm.CreateSCM(url=url, root_dir=root_dir,
                                   relpath=relpath)
       file_list = []
       scm.update(options, (), file_list)
       self.assertEquals(len(file_list), 2)
       self.assert_(os.path.isfile(os.path.join(base_path, 'a')))
-      self.assertEquals(self.GetGitRev(base_path),
+      self.assertEquals(scm.revinfo(options, (), None),
                         '069c602044c5388d2d15c3f875b057c852003458')
     finally:
       shutil.rmtree(root_dir)
 
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = [os.path.join(self.base_path, x) for x in ['a', 'b']]
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     scm.update(options, (), file_list)
-    self.assertEquals(self.GetGitRev(self.base_path),
+    self.assertEquals(file_list, expected_file_list)
+    self.assertEquals(scm.revinfo(options, (), None),
                       'a7142dc9f0009350b96a11f372b6ea658592aa95')
 
+  def testRevinfo(self):
+    if not self.enabled:
+      return
+    options = self.Options()
+    scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    rev_info = scm.revinfo(options, (), None)
+    self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
+
 
 class RunSVNTestCase(gclient_test.BaseTestCase):
   def testRunSVN(self):
     param2 = 'bleh'
     self.mox.StubOutWithMock(gclient_utils, 'SubprocessCall')
     gclient_utils.SubprocessCall(['svn', 'foo', 'bar'], param2).AndReturn(None)
     self.mox.ReplayAll()
     gclient_scm.RunSVN(['foo', 'bar'], param2)
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: