Extract replacement of .glkeep filename to helper

Author: embs

gitless/cli/commit_dialog.py

@@ -14,9 +14,8 @@
 import sys
 import shlex
 
-from gitless import core
 
-from . import pprint
+from . import pprint, helpers
 
 
 IS_PY2 = sys.version_info[0] == 2
@@ -57,8 +56,7 @@ 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, '')
+    f = helpers.remove_keep_file_name(f)
     pprint.item(f, stream=cf.write)
   pprint.sep(stream=cf.write)
   cf.close()

gitless/cli/file_cmd.py

@@ -39,8 +39,7 @@ def f(args, repo):
       try:
         empty_dir = fp.endswith(core.GL_KEEP_FILENAME)
         getattr(curr_b, subcmd + '_file')(fp)
-        if empty_dir:
-          fp = fp.replace(core.GL_KEEP_FILENAME, '')
+        fp = helpers.remove_keep_file_name(fp)
         pprint.ok(
             '{0} {1} is now a{2} {3}{4}d {5}'.format(
               'Empty directory' if empty_dir else 'File',

gitless/cli/gl_status.py

@@ -99,8 +99,7 @@ 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, '')
+    fp = helpers.remove_keep_file_name(fp)
 
     pprint.item(color(fp), opt_text=exp)
 
@@ -132,8 +131,7 @@ def _print_untracked_files(untracked_list, relative_paths, repo):
     fp = os.path.relpath(os.path.join(root, f.fp)) if relative_paths else f.fp
     if fp == '.':
       continue
-    if fp.endswith(core.GL_KEEP_FILENAME):
-      fp = fp.replace(core.GL_KEEP_FILENAME, '')
+    fp = helpers.remove_keep_file_name(fp)
 
     pprint.item(color(fp), opt_text=exp)
 

gitless/cli/helpers.py

@@ -251,3 +251,9 @@ def validate(fps, check_fn, msg):
   for e in err:
     pprint.err(e)
   return False
+
+
+def remove_keep_file_name(fp):
+  if(fp.endswith(core.GL_KEEP_FILENAME)):
+    return fp.replace(core.GL_KEEP_FILENAME, '')
+  return fp