Changeset 459

Timestamp:

08-01-10 17:56:56 (3 years ago)

Author:

thomas

Message:

patch by: Jan Urbanski

• moap/vcs/git.py: support added and deleted files in Git. Fixes #413.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/vcs/git.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2010-01-08  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        patch by: Jan Urbanski
+
+        * moap/vcs/git.py:
+          support added and deleted files in Git.
+          Fixes #413.
+
 2009-12-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/vcs/git.py

@@ -46 +46 @@
         os.chdir(oldPath)
         return result
+
+    def _getByStatus(self, path, status):
+        ret = []
+        oldPath = os.getcwd()
+
+        os.chdir(path)
+        cmd = "git diff --cached --diff-filter=%s --raw" % status
+        output = commands.getoutput(cmd)
+        lines = output.split("\n")
+        
+        matcher = re.compile(r'^:.*\.\.\. ' + status + '\s+(.*)')
+        for l in lines:
+            m = matcher.search(l)
+            if m:
+                relpath = m.expand("\\1")
+                ret.append(relpath)
+
+        # FIXME: would be nice to sort per directory
+        os.chdir(oldPath)
+        return ret
+
+    def getAdded(self, path):
+        return self._getByStatus(path, 'A')
+
+    def getDeleted(self, path):
+        return self._getByStatus(path, 'D')
 
     def ignore(self, paths, commit=True):
@@ -103 +129 @@
             self.debug('frobnicated path to %s' % path)
 
-        cmd = "git diff --cached -- %s" % path
+        cmd = "git diff --cached --diff-filter=M -- %s" % path
         self.debug("Running %s" % cmd)
         output = commands.getoutput(cmd)