Minor code cleanups.

Signed-off-by: Simon Hausmann <simon@lst.de>

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index c44292473a82fd349b69176038eafdf8c177f4f6..d1faa7c29040407fd80a8724f5c1e565ca00d24b 100755 (executable)
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -183,6 +183,8 @@ def getUserMap():
 if tzsign != '+' and tzsign != '-':
     tz = "+" + ("%s" % tz)
 
 if tzsign != '+' and tzsign != '-':
     tz = "+" + ("%s" % tz)
 

+gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
+

 if len(revision) > 0:
     print "Doing initial import of %s from revision %s" % (prefix, revision)
 
 if len(revision) > 0:
     print "Doing initial import of %s from revision %s" % (prefix, revision)
 


@@ -207,15 +209,11 @@ def getUserMap():
 
     details["change"] = newestRevision
 
 
     details["change"] = newestRevision
 

-    gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")

     try:
         commit(details)
     except:
         print gitError.read()
 
     try:
         commit(details)
     except:
         print gitError.read()
 

-    gitStream.close()
-    gitOutput.close()
-    gitError.close()

 else:
     output = os.popen("p4 changes %s...%s" % (prefix, changeRange)).readlines()
 
 else:
     output = os.popen("p4 changes %s...%s" % (prefix, changeRange)).readlines()
 


@@ -230,8 +228,6 @@ def getUserMap():
         print "no changes to import!"
         sys.exit(1)
 
         print "no changes to import!"
         sys.exit(1)
 

-    gitOutput, gitStream, gitError = popen2.popen3("git-fast-import")
-

     cnt = 1
     for change in changes:
         description = p4Cmd("describe %s" % change)
     cnt = 1
     for change in changes:
         description = p4Cmd("describe %s" % change)


@@ -246,12 +242,12 @@ def getUserMap():
             print gitError.read()
             sys.exit(1)
 
             print gitError.read()
             sys.exit(1)
 

-    gitStream.close()
-    gitOutput.close()
-    gitError.close()
-

 print ""
 
 print ""
 

+gitStream.close()
+gitOutput.close()
+gitError.close()
+

 os.popen("git-repo-config p4.depotpath %s" % prefix).read()
 
 sys.exit(0)
 os.popen("git-repo-config p4.depotpath %s" % prefix).read()
 
 sys.exit(0)