- Add '!' and 'L' status support....

tests/gclient_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 1103 matching lines @@
                            scm, 'update', options, self.args)
     self.mox.VerifyAll()
 
   def testRunCommandUnknown(self):
     # TODO(maruel): if ever used.
     pass
 
   def testRevertMissing(self):
     options = self.Options(verbose=True)
     gclient.os.path.isdir = self.mox.CreateMockAnything()
-    gclient.os.path.isdir(os.path.join(self.root_dir, self.relpath)
-        ).AndReturn(False)
-    print >>options.stdout, ("\n_____ %s is missing, can't revert" %
+    base_path = os.path.join(self.root_dir, self.relpath)
+    gclient.os.path.isdir(base_path).AndReturn(False)
+    # It'll to a checkout instead.
+    options.path_exists(os.path.join(base_path, '.git')).AndReturn(False)
+    print >>options.stdout, ("\n_____ %s is missing, synching instead" %
                              self.relpath)
+    # Checkout.
+    options.path_exists(base_path).AndReturn(False)
+    files_list = self.mox.CreateMockAnything()
+    gclient.RunSVNAndGetFileList(options, ['checkout', self.url, base_path],
+                                 self.root_dir, files_list)
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
-    file_list = []
-    scm.revert(options, self.args, file_list)
+    scm.revert(options, self.args, files_list)
     self.mox.VerifyAll()
     gclient.os.path.isdir = os.path.isdir
 
   def testRevertNone(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir = self.mox.CreateMockAnything()
     gclient.os.path.isdir(base_path).AndReturn(True)
     gclient.CaptureSVNStatus(options, base_path).AndReturn([])
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.mox.VerifyAll()
     gclient.os.path.isdir = os.path.isdir
 
   def testRevert2Files(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir = self.mox.CreateMockAnything()
     gclient.os.path.isdir(base_path).AndReturn(True)
     items = [
-      gclient.FileStatus('a', 'M', ' ', ' '), 
-      gclient.FileStatus('b', 'A', ' ', ' '),
+      gclient.FileStatus('a', 'M', ' ', ' ', ' '), 
+      gclient.FileStatus('b', 'A', ' ', ' ', ' '),
     ]
     gclient.CaptureSVNStatus(options, base_path).AndReturn(items)
 
     print >>options.stdout, os.path.join(base_path, 'a')
     print >>options.stdout, os.path.join(base_path, 'b')
     gclient.RunSVN(options, ['revert', 'a', 'b'], base_path)
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.mox.VerifyAll()
     gclient.os.path.isdir = os.path.isdir
 
   def testStatus(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
+    gclient.os.path.isdir = self.mox.CreateMockAnything()
+    gclient.os.path.isdir(base_path).AndReturn(True)
     gclient.RunSVNAndGetFileList(options, ['status'] + self.args, base_path,
                                  []).AndReturn(None)
 
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
     file_list = []
     self.assertEqual(scm.status(options, self.args, file_list), None)
     self.mox.VerifyAll()
 
 
   # TODO(maruel):  TEST REVISIONS!!!
   # TODO(maruel):  TEST RELOCATE!!!
   def testUpdateCheckout(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     file_info = gclient.PrintableObject()
     file_info.root = 'blah'
     file_info.url = self.url
     file_info.uuid = 'ABC'
     file_info.revision = 42
     options.path_exists(os.path.join(base_path, '.git')).AndReturn(False)
-    # Checkout or update.
+    # Checkout.
     options.path_exists(base_path).AndReturn(False)
-    print >>options.stdout, "\n_____ asf at 42"
-    #print >>options.stdout, "\n________ running 'svn checkout %s %s' in '%s'" % (
-    #    self.url, base_path, os.path.abspath(self.root_dir))
-
-    gclient.CaptureSVNInfo(options, os.path.join(base_path, "."), '.'
-        ).AndReturn(file_info)
-    # Cheat a bit here.
-    gclient.CaptureSVNInfo(options, file_info.url, '.').AndReturn(file_info)
     files_list = self.mox.CreateMockAnything()
     gclient.RunSVNAndGetFileList(options, ['checkout', self.url, base_path],
                                  self.root_dir, files_list)
     self.mox.ReplayAll()
     scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
                              relpath=self.relpath)
-    #file_list = []
     scm.update(options, (), files_list)
     self.mox.VerifyAll()
 
   def testUpdateUpdate(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     options.force = True
     file_info = gclient.PrintableObject()
     file_info.root = 'blah'
     file_info.url = self.url
@@ skipping 66 matching lines @@
     self.failUnless(file_info.url == self.url)
     self.failUnless(file_info.uuid == '7b9385f5-0452-0410-af26-ad4892b7a1fb')
     self.failUnless(file_info.revision == 35)
     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: