Make git-freeze bail out if the user has too much untracked data.

tests/git_common_test.py

 #!/usr/bin/env python
 # Copyright 2013 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 git_common.py"""
 
 import binascii
 import collections
 import os
@@ skipping 397 matching lines @@
   def testMkTree(self):
     tree = {}
     for i in 1, 2, 3:
       name = 'file%d' % i
       tree[name] = ('100644', 'blob', self._intern_data(name))
     tree_hash = self.repo.run(self.gc.mktree, tree)
     self.assertEquals('37b61866d6e061c4ba478e7eb525be7b5752737d', tree_hash)
 
   def testConfig(self):
     self.repo.git('config', '--add', 'happy.derpies', 'food')
-    self.assertEquals(self.repo.run(self.gc.config_list, 'happy.derpies'),
+    self.assertEquals(self.repo.run(self.gc.get_config_list, 'happy.derpies'),
                       ['food'])
-    self.assertEquals(self.repo.run(self.gc.config_list, 'sad.derpies'), [])
+    self.assertEquals(self.repo.run(self.gc.get_config_list, 'sad.derpies'), [])
 
     self.repo.git('config', '--add', 'happy.derpies', 'cat')
-    self.assertEquals(self.repo.run(self.gc.config_list, 'happy.derpies'),
+    self.assertEquals(self.repo.run(self.gc.get_config_list, 'happy.derpies'),
                       ['food', 'cat'])
 
-    self.assertEquals('cat', self.repo.run(self.gc.config, 'dude.bob', 'cat'))
+    self.assertEquals('cat', self.repo.run(self.gc.get_config, 'dude.bob',
+                                           'cat'))
 
     self.repo.run(self.gc.set_config, 'dude.bob', 'dog')
 
-    self.assertEquals('dog', self.repo.run(self.gc.config, 'dude.bob', 'cat'))
+    self.assertEquals('dog', self.repo.run(self.gc.get_config, 'dude.bob',
+                                           'cat'))
 
     self.repo.run(self.gc.del_config, 'dude.bob')
 
     # This should work without raising an exception
     self.repo.run(self.gc.del_config, 'dude.bob')
 
-    self.assertEquals('cat', self.repo.run(self.gc.config, 'dude.bob', 'cat'))
+    self.assertEquals('cat', self.repo.run(self.gc.get_config, 'dude.bob',
+                                           'cat'))
 
     self.assertEquals('origin/master', self.repo.run(self.gc.root))
 
     self.repo.git('config', 'depot-tools.upstream', 'catfood')
 
     self.assertEquals('catfood', self.repo.run(self.gc.root))
 
   def testUpstream(self):
     self.repo.git('commit', '--allow-empty', '-am', 'foooooo')
     self.assertEquals(self.repo.run(self.gc.upstream, 'bobly'), None)
@@ skipping 104 matching lines @@
       self.repo['B'],
       self.repo.run(self.gc.get_or_create_merge_base, 'branch_K', 'branch_G')
     )
 
     self.assertEqual(
       self.repo['J'],
       self.repo.run(self.gc.get_or_create_merge_base, 'branch_L', 'branch_K')
     )
 
     self.assertEqual(
-      self.repo['B'], self.repo.run(self.gc.config, 'branch.branch_K.base')
+      self.repo['B'], self.repo.run(self.gc.get_config, 'branch.branch_K.base')
     )
     self.assertEqual(
-      'branch_G', self.repo.run(self.gc.config, 'branch.branch_K.base-upstream')
+      'branch_G', self.repo.run(self.gc.get_config,
+                                'branch.branch_K.base-upstream')
     )
 
     # deadbeef is a bad hash, so this will result in repo['B']
     self.repo.run(self.gc.manual_merge_base, 'branch_K', 'deadbeef', 'branch_G')
 
     self.assertEqual(
       self.repo['B'],
       self.repo.run(self.gc.get_or_create_merge_base, 'branch_K', 'branch_G')
     )
 
     # but if we pick a real ancestor, then it'll work
     self.repo.run(self.gc.manual_merge_base, 'branch_K', self.repo['I'],
                   'branch_G')
 
     self.assertEqual(
       self.repo['I'],
       self.repo.run(self.gc.get_or_create_merge_base, 'branch_K', 'branch_G')
     )
 
     self.assertEqual({'branch_K': self.repo['I'], 'branch_L': self.repo['J']},
                      self.repo.run(self.gc.branch_config_map, 'base'))
 
     self.repo.run(self.gc.remove_merge_base, 'branch_K')
     self.repo.run(self.gc.remove_merge_base, 'branch_L')
 
-    self.assertEqual(None,
-                     self.repo.run(self.gc.config, 'branch.branch_K.base'))
+    self.assertEqual(None, self.repo.run(self.gc.get_config,
+                                         'branch.branch_K.base'))
 
     self.assertEqual({}, self.repo.run(self.gc.branch_config_map, 'base'))
 
     # if it's too old, then it caps at merge-base
     self.repo.run(self.gc.manual_merge_base, 'branch_K', self.repo['A'],
                   'branch_G')
 
     self.assertEqual(
       self.repo['B'],
       self.repo.run(self.gc.get_or_create_merge_base, 'branch_K', 'branch_G')
@@ skipping 117 matching lines @@
     self.repo.git('rebase', '--continue')
 
     self.assertSchema("""
     A B C D E F G H I J K L
 
     X Y Z
 
     CAT DOG
     """)
 
+  def testStatus(self):
+    def inner():
+      dictified_status = lambda: {
+          k: dict(v._asdict())  # pylint: disable=W0212
+          for k, v in self.repo.run(self.gc.status).iteritems()
+      }
+      self.repo.git('mv', 'file', 'cat')
+      with open('COOL', 'w') as f:
+        f.write('Super cool file!')
+      self.assertDictEqual(
+          dictified_status(),
+          {'cat':  {'lstat': 'R', 'rstat': ' ', 'src': 'file'},
+           'COOL': {'lstat': '?', 'rstat': '?', 'src': 'COOL'}}
+      )
+
+    self.repo.run(inner)
+
 
 class GitFreezeThaw(git_test_utils.GitRepoReadWriteTestBase):
   @classmethod
   def setUpClass(cls):
     super(GitFreezeThaw, cls).setUpClass()
     import git_common
     cls.gc = git_common
     cls.gc.TEST_MODE = True
 
   REPO_SCHEMA = """
@@ skipping 58 matching lines @@
       self.assertEquals(self.repo.git('status', '--porcelain').stdout, '')
 
       # Thaw it out!
       self.assertIsNone(self.gc.thaw())
       self.assertIsNotNone(self.gc.thaw())  # One thaw should thaw everything
 
       self.assertEquals(self.repo.git('status', '--porcelain').stdout, STATUS_1)
 
     self.repo.run(inner)
 
+  def testTooBig(self):
+    def inner():
+      self.repo.git('config', 'depot-tools.freeze-size-limit', '1')
+      with open('bigfile', 'w') as f:
+        chunk = 'NERDFACE' * 1024
+        for _ in xrange(128 * 2 + 1):  # Just over 2 mb
+          f.write(chunk)
+      _, err = self.repo.capture_stdio(self.gc.freeze)
+      self.assertIn('too much untracked+unignored', err)
+
+    self.repo.run(inner)
+
+  def testMerge(self):
+    def inner():
+      self.repo.git('checkout', '-b', 'bad_merge_branch')
+      with open('bad_merge', 'w') as f:
+        f.write('bad_merge_left')
+      self.repo.git('add', 'bad_merge')
+      self.repo.git('commit', '-m', 'bad_merge')
+
+      self.repo.git('checkout', 'branch_D')
+      with open('bad_merge', 'w') as f:
+        f.write('bad_merge_right')
+      self.repo.git('add', 'bad_merge')
+      self.repo.git('commit', '-m', 'bad_merge_d')
+
+      self.repo.git('merge', 'bad_merge_branch')
+
+      _, err = self.repo.capture_stdio(self.gc.freeze)
+      self.assertIn('Cannot freeze unmerged changes', err)
+
+    self.repo.run(inner)
+
 
 class GitMakeWorkdir(git_test_utils.GitRepoReadOnlyTestBase, GitCommonTestBase):
   def setUp(self):
     self._tempdir = tempfile.mkdtemp()
 
   def tearDown(self):
     shutil.rmtree(self._tempdir)
 
   REPO_SCHEMA = """
   A
@@ skipping 40 matching lines @@
                       self.repo.show_commit('A', format_string='%cn %ci'))
     self.assertEquals('Author McAuthorly 1970-01-03 00:00:00 +0000',
                       self.repo.show_commit('B', format_string='%an %ai'))
     self.assertEquals('Charles Committish 1970-01-04 00:00:00 +0000',
                       self.repo.show_commit('B', format_string='%cn %ci'))
 
 
 if __name__ == '__main__':
   sys.exit(coverage_utils.covered_main(
     os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py')))