[meld] Support showing ignored files in git



commit 13d0933b851426f4ae8b422589eb35b0ab094fce
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Jun 25 15:12:07 2010 +1000

    Support showing ignored files in git

 meld/vc/git.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 7b50cfd..4cc2cd4 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -45,6 +45,7 @@ class Vc(_vc.CachedVc):
         "M": _vc.STATE_MODIFIED, # Modified
         "T": _vc.STATE_MODIFIED, # Type-changed
         "U": _vc.STATE_CONFLICT, # Unmerged
+        "I": _vc.STATE_IGNORED,  # Ignored (made-up status letter)
     }
 
     def check_repo_root(self, location):
@@ -90,6 +91,10 @@ class Vc(_vc.CachedVc):
                     "-0", "./"], cwd=self.location)
                 entries += (proc.read().split("\n")[:-1])
 
+                proc = _vc.popen([self.CMD, "ls-files", "--others", \
+                    "--ignored", "--exclude-standard"], cwd=self.location)
+                entries += ("I\t%s" % f for f in proc.read().split("\n")[:-1])
+
                 # An unmerged file or a file that has been modified, added to
                 # git's index, then modified again would result in the file
                 # showing up in both the output of "diff-files" and



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]