Cleanup tree_status and use -z

Improved the python code, eliminating temporary variables and using
destructuring binds. And use NUL-separation instead of newlines.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/patches.py b/stgit/commands/patches.py
index b3defb6cc05debdfa080d0b831f8cf67fe84a192..fb65b621c4e90cc0ed309e80c09d91e59ea00c55 100644 (file)
--- a/stgit/commands/patches.py
+++ b/stgit/commands/patches.py
@@ -51,7 +51,7 @@ def func(parser, options, args):
     """Show the patches modifying a file
     """
     if not args:
     """Show the patches modifying a file
     """
     if not args:

-        files = [stat[1] for stat in git.tree_status(verbose = True)]
+        files = [path for (stat,path) in git.tree_status(verbose = True)]

     else:
         files = args
 
     else:
         files = args
 

diff --git a/stgit/commands/refresh.py b/stgit/commands/refresh.py
index 218075b63a518dd904252778daca508d7f0146ec..f44c58ce21972631dc06ed2cc5ab2ecc66ce7534 100644 (file)
--- a/stgit/commands/refresh.py
+++ b/stgit/commands/refresh.py
@@ -121,7 +121,7 @@ def func(parser, options, args):
     else:
         sign_str = None
 
     else:
         sign_str = None
 

-    files = [x[1] for x in git.tree_status(verbose = True)]
+    files = [path for (stat,path) in git.tree_status(verbose = True)]

     if args:
         files = [f for f in files if f in args]
 
     if args:
         files = [f for f in files if f in args]
 

diff --git a/stgit/git.py b/stgit/git.py
index 7962cdb2ee20ca1fede553a2dc03dd0dd14679ef..f315b053cacc63fd45ae9b48aabf36f181e4209d 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -168,7 +168,7 @@ def exclude_files():
 
 def tree_status(files = None, tree_id = 'HEAD', unknown = False,
                   noexclude = True, verbose = False, diff_flags = []):
 
 def tree_status(files = None, tree_id = 'HEAD', unknown = False,
                   noexclude = True, verbose = False, diff_flags = []):

-    """Returns a list of pairs - [status, filename]
+    """Returns a list of pairs - (status, filename)

     """
     if verbose:
         out.start('Checking for changes in the working directory')
     """
     if verbose:
         out.start('Checking for changes in the working directory')


@@ -181,16 +181,16 @@ def tree_status(files = None, tree_id = 'HEAD', unknown = False,
 
     # unknown files
     if unknown:
 
     # unknown files
     if unknown:

-        if noexclude:
-            exclude = []
-        else:
-            exclude = (['--exclude=%s' % s for s in
-                        ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']]
-                       + ['--exclude-per-directory=.gitignore']
-                       + ['--exclude-from=%s' % fn for fn in exclude_files()
-                          if os.path.exists(fn)])
-        lines = GRun('git-ls-files', '--others', '--directory', *exclude
-                     ).output_lines()
+        cmd = ['git-ls-files', '-z', '--others', '--directory']
+        if not noexclude:
+            cmd += ['--exclude=%s' % s for s in
+                    ['*.[ao]', '*.pyc', '.*', '*~', '#*', 'TAGS', 'tags']]
+            cmd += ['--exclude-per-directory=.gitignore']
+            cmd += ['--exclude-from=%s' % fn
+                    for fn in exclude_files()
+                    if os.path.exists(fn)]
+
+        lines = GRun(*cmd).raw_output().split('\0')

         cache_files += [('?', line) for line in lines]
 
     # conflicted files
         cache_files += [('?', line) for line in lines]
 
     # conflicted files