Handle empty dirs in gl status

So users can operate (track, untrack, etc.) on them if they wish.

Author: embs

gitless/cli/gl_status.py

@@ -84,8 +84,10 @@ def _print_tracked_mod_files(tracked_mod_list, relative_paths, repo):
   for f in tracked_mod_list:
     exp = ''
     color = colored.yellow
+    is_keep_file = f.fp.endswith(core.GL_KEEP_FILENAME)
     if not f.exists_at_head:
-      exp = ' (new file)'
+      kind = 'directory' if is_keep_file else 'file'
+      exp = ' (new {0})'.format(kind)
       color = colored.green
     elif not f.exists_in_wd:
       exp = ' (deleted)'
@@ -97,6 +99,8 @@ def _print_tracked_mod_files(tracked_mod_list, relative_paths, repo):
     fp = os.path.relpath(os.path.join(root, f.fp)) if relative_paths else f.fp
     if fp == '.':
       continue
+    if is_keep_file:
+      fp = fp.replace(core.GL_KEEP_FILENAME, '')
 
     pprint.item(color(fp), opt_text=exp)
 

gitless/core.py

@@ -771,6 +771,14 @@ def status(self):
         yield self.FileStatus(
             fp, GL_STATUS_UNTRACKED, True, exists_in_wd, True, False)
 
+    # find untracked empty dirs
+    for dirpath, dirs, files in os.walk('.', topdown=True):
+      dirs[:] = [d for d in dirs if d not in ['.git'] and not
+          self.path_is_ignored(d)]
+      if not dirs and not files:
+        yield self.FileStatus(dirpath, GL_STATUS_UNTRACKED, False, True, False,
+            False)
+
   def status_file(self, path):
     """Return the status (see FileStatus) of the given path."""
     return self._status_file(path)[0]

gitless/tests/test_e2e.py

@@ -685,17 +685,48 @@ def test_uncommitted_tracked_changes_that_conflict_append(self):
 
 class TestEmptyDir(TestEndToEnd):
 
+  def test_empty_dir_status(self):
+    untracked_empty_dir = self._mk_empty_dir('untracked_empty_dir')
+
+    out = utils.stdout(gl.status())
+
+    self.assertIn(untracked_empty_dir, out, 'Empty dir didn\'t appear in status')
+
+  def test_ignored_empty_dir_status(self):
+    ignored_empty_dir = self._mk_empty_dir('ignored_empty_dir')
+    utils.write_file(os.path.join(self.path, '.gitignore'), ignored_empty_dir)
+
+    out = utils.stdout(gl.status())
+
+    self.assertFalse(ignored_empty_dir in out,
+        'Ignored empty dir was listed in status')
+
   def test_track_empty_dir(self):
-    dir_to_track = 'wanted_empty_dir'
-    dir_to_track_path = os.path.join(self.path, dir_to_track)
-    os.mkdir(dir_to_track_path)
+    dir_to_track = self._mk_empty_dir('wanted_empty_dir')
     expected_out = 'Empty directory {0} is now a tracked directory'.format(
-      os.path.join(dir_to_track, ''))
+      self._dir_path(dir_to_track))
 
-    out = utils.stdout(gl.track(dir_to_track_path))
+    out = utils.stdout(gl.track(dir_to_track))
 
     self.assertIn(expected_out, out, 'Empty dir wasn\'t tracked')
 
+  def test_tracked_empty_dir_status(self):
+    tracked_empty_dir = self._mk_empty_dir('tracked_empty_dir')
+    gl.track(tracked_empty_dir)
+    expected_out = '{0} (new directory)'.format(
+        self._dir_path(tracked_empty_dir))
+
+    out = utils.stdout(gl.status())
+
+    self.assertIn(expected_out, out, 'Didn\'t report newly tracked dir')
+
+  def _mk_empty_dir(self, name):
+    os.mkdir(os.path.join(self.path, name))
+    return name
+
+  def _dir_path(self, path):
+    return os.path.join(path, '')
+
 
 class TestPerformance(TestEndToEnd):