Add --reset-to-deps and improve comments

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Unit tests for gclient_scm.py."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
@@ skipping 509 matching lines @@
     ]
 
     # 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 = gclient_scm.os.path.join(self.base_path, 'a')
-    gclient_scm.os.remove(file_path)
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
+    scm.update(options, None, file_list)
+    gclient_scm.os.remove(file_path)
+    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.update(options, None, file_list)
+    file_list = []
     scm.revert(options, self.args, file_list)
     self.assertEquals(file_list, [])
     self.assertEquals(scm.revinfo(options, self.args, None),
-                      '069c602044c5388d2d15c3f875b057c852003458')
+                      'a7142dc9f0009350b96a11f372b6ea658592aa95')
 
 
   def testRevertModified(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.update(options, None, file_list)
     file_path = gclient_scm.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(scm.revinfo(options, self.args, None),
-                      '069c602044c5388d2d15c3f875b057c852003458')
+                      'a7142dc9f0009350b96a11f372b6ea658592aa95')
 
   def testRevertNew(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.update(options, None, file_list)
     file_path = gclient_scm.os.path.join(self.base_path, 'c')
     f = open(file_path, 'w')
     f.writelines('new\n')
     f.close()
     Popen(['git', 'add', 'c'], stdout=PIPE,
           stderr=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(scm.revinfo(options, self.args, None),
-                      '069c602044c5388d2d15c3f875b057c852003458')
+                      'a7142dc9f0009350b96a11f372b6ea658592aa95')
 
   def testStatusNew(self):
     if not self.enabled:
       return
     options = self.Options()
     file_path = gclient_scm.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 = []
@@ skipping 118 matching lines @@
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: