Fix indentation and interpreter

[claws.git] / tools / gitlog2changelog.py

diff --git a/tools/gitlog2changelog.py b/tools/gitlog2changelog.py
index c5dc10fa59892675462573dc1a5ecd2913ff69db..cebbd0c5cbd2217d31958bbd33c3d7614aaab21e 100755 (executable)
--- a/tools/gitlog2changelog.py
+++ b/tools/gitlog2changelog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 # Copyright 2008 Marcus D. Hanwell <marcus@cryos.org>
 # Adapted for Claws Mail - Copyright 2013 Colin Leroy <colin@colino.net>
 # Distributed under the terms of the GNU General Public License v2 or later
@@ -49,9 +49,9 @@ for line in fin:
         message = ""
         filesFound = False
         files = ""
-       commitCmd = os.popen("git describe "+re.split(' ', line, 1)[1])
-       commit = commitCmd.read()
-       commitCmd.close()
+        commitCmd = os.popen("git describe "+re.split(' ', line, 1)[1])
+        commit = commitCmd.read()
+        commitCmd.close()
         commit = commit[0:len(commit)-1]
         continue
     # Match the author line and extract the part we want
@@ -60,12 +60,14 @@ for line in fin:
         author = re.split('<', authorList[1], 1)[0]
         author = "[" + author[0:len(author)-1]+"]"
         authorFound = True
+        continue
     # Match the date line
     elif re.match('^Date:', line) >= 0:
         dateList = re.split(':   ', line, 1)
         date = dateList[1]
         date = date[0:len(date)-1]
         dateFound = True
+    continue
     # The svn-id lines are ignored
     elif re.match('    git-svn-id:', line) >= 0:
         continue
@@ -88,7 +90,7 @@ for line in fin:
             else:
                 message = message + " " + line.strip()
     # If this line is hit all of the files have been stored for this commit
-    elif re.search('files changed', line) >= 0:
+    elif re.search('file(s)? changed', line) >= 0:
         filesFound = True
         continue
     # Collect the files for this commit. FIXME: Still need to add +/- to files
@@ -105,8 +107,8 @@ for line in fin:
         # author on this day
         authorLine = date + "  " + author
         if len(prevAuthorLine) != 0:
-           fout.write("\n");
-       fout.write(authorLine + " " + commit + "\n\n")
+            fout.write("\n");
+        fout.write(authorLine + " " + commit + "\n\n")
 
         # Assemble the actual commit message line(s) and limit the line length
         # to 80 characters.
@@ -126,7 +128,7 @@ for line in fin:
                 i = i+71
 
         # Write out the commit line
-       fout.write(files + "\t\t" + commit + "\n")
+        fout.write(files + "\t\t" + commit + "\n")
 
         #Now reset all the variables ready for a new commit block.
         authorFound = False