Hid keep file name in commit dialogue

Author: embs

gitless/cli/commit_dialog.py

@@ -14,6 +14,7 @@
 import sys
 import shlex
 
+from gitless import core
 
 from . import pprint
 
@@ -56,6 +57,8 @@ def show(files, repo):
   pprint.msg(
       'These are the files whose changes will be committed:', stream=cf.write)
   for f in files:
+    if f.endswith(core.GL_KEEP_FILENAME):
+      f = f.replace(core.GL_KEEP_FILENAME, '')
     pprint.item(f, stream=cf.write)
   pprint.sep(stream=cf.write)
   cf.close()

gitless/tests/test_e2e.py

@@ -20,6 +20,7 @@
   gl = Command('gl')
   git = Command('git')
 
+from gitless import core
 
 from gitless.tests import utils
 
@@ -730,6 +731,25 @@ def test_tracked_empty_dir_status(self):
 
     self.assertIn(expected_out, out, 'Didn\'t report newly tracked dir')
 
+  def test_commit_empty_dir(self):
+    empty_dir = self._mk_empty_dir('wanted_empty_dir')
+    gl.track(empty_dir)
+    pipe = 'std.out'
+    gl.commit(_out = pipe, _bg = True)
+
+    f = open(pipe)
+    out = previous_out = ''
+    while(os.path.getsize(pipe) == 0 or out != previous_out):
+      time.sleep(0.1)
+      previous_out = out
+      f.seek(0)
+      out = f.read()
+    f.close()
+
+    self.assertIn(self._dir_path(empty_dir), out)
+    self.assertFalse(core.GL_KEEP_FILENAME in out,
+        'Output included gitless keep file name')
+
   def test_untracked_empty_dir_status(self):
     untracked_empty_dir = self._mk_empty_dir('untracked_empty_dir')
     gl.track(untracked_empty_dir)