Fix(set-commit-date.py): Consider deleted files

[git-scripts.git] / set-commit-date.py

diff --git a/set-commit-date.py b/set-commit-date.py
index 9588bd87aa26e991006637b3e7779c2df82ffa99..45302528606e7cc40398a647b87c94a1111668ee 100755 (executable)
--- a/set-commit-date.py
+++ b/set-commit-date.py
@@ -8,17 +8,24 @@
 import os
 import subprocess
 
+git_root = subprocess.check_output(['git', 'rev-parse', '--show-toplevel'],
+                                   universal_newlines=True).rstrip('\n')
+os.chdir(git_root)
+
 separator = '----- GIT LOG SEPARATOR -----'
 
 git_log = subprocess.Popen(['git', 'log', '-m', '--first-parent',
-                            '--name-only', '--no-color',
+                            '--name-status', '--no-color',
                             '--format=%s%%n%%ct' % separator],
-                           stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-filenames = set()
+                           stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                           universal_newlines=True)
+changed_files = set()
+deleted_files = set()
+
 # stages: 1 - start of commit, 2 - timestamp, 3 - empty line, 4 - files
 stage = 1
-while True:
-    line = git_log.stdout.readline().strip()
+for line in git_log.stdout:
+    line = line.strip()
     if (stage in (1, 4)) and (line == separator):  # Start of a commit
         stage = 2
     elif stage == 2:
@@ -30,12 +37,17 @@ while True:
             continue
         stage = 4
         assert line == '', line
-    elif not line:  # EOF
-        break
     elif stage == 4:
-        filename = line
-        if filename not in filenames:
-            filenames.add(filename)
+        if line.startswith('A') or line.startswith('M') \
+                or line.startswith('D'):
+            filename = line.split(None, 2)[1]
+        elif line.startswith('R'):
+            filename = line.split(None, 3)[2]  # renamed to
+        if line.startswith('D'):
+            if filename not in changed_files:  # The file was not readded
+                deleted_files.add(filename)
+        if filename not in deleted_files and filename not in changed_files:
+            changed_files.add(filename)
             if os.path.exists(filename):
                 os.utime(filename, (time, time))
     else: